@hyperscale0/hsx 5.7.0 → 6.0.0

package/src/version.ts

@@ -1 +1 @@
-export const HSX_VERSION = "5.7.0";
+export const HSX_VERSION = "6.0.0";

package/std/financing.hsx

@@ -10,6 +10,8 @@ header financing
 // it tops up only the missing down payment, without advancing lender principal.
 // Disburse still collects any missing down payment, activates slices, and confirms
 // the fully funded hold. Existing escrow credit counts once toward the down payment.
+// Disburse first credits an active marketplace.reservation on the same hold,
+// so list the plan in its converters; the deposit then counts as escrow credit.
 // Borrower-directed disbursement excludes collect_down_payment. A down_payment
 // there reduces principal but does not collect cash. Price is subject metadata,
 // not the borrower limit. The escrow payer and price must match the plan.
@@ -82,7 +84,7 @@ instrument installments(months: integer(1, 366), charge_limit: integer(1, 3) = 3
     requires self.portfolioLimit in [approved]
     when disburse_to is funds {
       requires self.funds in [pending]
-      invoke: [{ reference: self.id, action: fund_down_payment, input: {} }]
+      invoke: [{ selection: { instrument: all(marketplace.reservation), reference: "funds", anchor: self.funds, states: [active], limit: 1 }, action: credit, input: { funds: { field: self.funds }, contribution: { field: self.downPayment } } }, { reference: self.id, action: fund_down_payment, input: {} }]
     }
     when disburse_to is borrower { moves self.principal from self.capital to self.borrower economics { purpose: principal, sourceParty: capital } }
     invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.id, states: [draft], limit: 366, order: [position] }, action: activate, input: {} }]

package/std/marketplace.hsx

@@ -9,8 +9,8 @@ header marketplace
 // verify_return and refund aliases. Refund needs disputed -> return_verified,
 // with payee evidence, then returns the full price to payer; accept pays payee.
 // A reservation holds its own deposit. Activate requires an active listing and
-// no placed order. Convert must wire the declared converters to invoke credit;
-// naming a converter alone does not add that invocation. Credit consumes the
+// no placed order. Only a declared converter may invoke credit. A financing
+// plan on the same hold credits it when the lender disburses. Credit consumes the
 // deposit once, credits at most the contribution, and returns excess to buyer.
 // Expose cancel, seller_cancel or operator_cancel for the intended actors.
 // Buyer cancel and expiry use configured refund percentages; seller/operator
@@ -64,7 +64,7 @@ instrument order(listing: ref<marketplace.listing>, buyer: party) {
   action cancel { from: [quoted, placed], to: cancelled, actor: { party: buyer } }
 }
 
-instrument reservation(listing: ref<marketplace.listing>, funds: ref<escrow.hold>, plans: ref<financing.installments>[], converters: ref[], buyer: party, seller: party, expires_after: duration = 48h, deposit: money = 1000 SAR, cancellation_refund: percent = 100%, expiry_refund: percent = 100%, retained_to: party = programOperator, operator: party = programOperator, competing_quotes: enum(allowed, blocked) = allowed) {
+instrument reservation(listing: ref<marketplace.listing>, funds: ref<escrow.hold>, converters: ref[], buyer: party, seller: party, expires_after: duration = 48h, deposit: money = 1000 SAR, cancellation_refund: percent = 100%, expiry_refund: percent = 100%, retained_to: party = programOperator, operator: party = programOperator, competing_quotes: enum(allowed, blocked) = allowed) {
   revisioned: true
   summary: "Exclusive timed listing hold with explicit deposit credit and refund."
   fields {
@@ -82,12 +82,6 @@ instrument reservation(listing: ref<marketplace.listing>, funds: ref<escrow.hold
     requires count of { instrument: all(marketplace.order), reference: "listing", anchor: self.listing, states: [placed, fulfilled], limit: 366 } == 0
     moves self.deposit from self.buyer to self.held economics { purpose: principal, sourceParty: buyer }
   }
-  action convert_financed {
-    from: active, to: active, actor: { party: buyer }, deadline: { at: self.expiresAt }
-    input { plan: ref<plans> }
-    requires input.plan.funds == self.funds; requires input.plan.borrower == self.buyer
-    invoke: [{ reference: input.plan, action: disburse, input: {} }]
-  }
   action convert_cash {
     from: active, to: active, actor: { party: buyer }, deadline: { at: self.expiresAt }
     invoke: [{ reference: self.funds, action: fund, input: {} }]