Show pYes and volume in market row

public/css/_tw-input.css

@@ -11,7 +11,7 @@
   --black: #000;
   --white: #fff;
   --bg-success: #149e613d;
-  --fg-success:  #35df8d;
+  --fg-success: #35df8d;
   --bg-error: #f5395e3d;
   --fg-error: #ff7386;
 }
@@ -108,6 +108,14 @@
     color: var(--color);
   }
 
+  .text-success {
+    color: var(--fg-success);
+  }
+
+  .text-error {
+    color: var(--fg-error);
+  }
+
   .hitbox {
     padding: 15px;
     margin: -15px;
@@ -124,7 +132,8 @@
     color: var(--fg-success);
   }
 
-  .neon.success:hover, .neon.success.active {
+  .neon.success:hover,
+  .neon.success.active {
     background-color: var(--fg-success);
     color: var(--white);
   }
@@ -134,7 +143,8 @@
     color: var(--fg-error);
   }
 
-  .neon.error:hover, .neon.error.active {
+  .neon.error:hover,
+  .neon.error.active {
     background-color: var(--fg-error);
     color: var(--white);
   }

server/router/handler/index.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"database/sql"
 
+	"git.ekzyis.com/ekzyis/delphi.market/lib/lmsr"
 	"git.ekzyis.com/ekzyis/delphi.market/server/router/context"
 	"git.ekzyis.com/ekzyis/delphi.market/server/router/pages"
 	"git.ekzyis.com/ekzyis/delphi.market/types"
@@ -15,16 +16,29 @@ func HandleIndex(sc context.Context) echo.HandlerFunc {
 			db      = sc.Db
 			ctx     = c.Request().Context()
 			rows    *sql.Rows
-			err     error
 			markets []types.Market
+			err     error
 		)
 
 		if rows, err = db.QueryContext(ctx, ""+
+			"WITH lmsr AS ("+
+			"  SELECT "+
+			"    o.market_id, "+
+			"    COALESCE(SUM(o.quantity) FILTER(WHERE o.outcome = 0), 0) AS q1, "+
+			"    COALESCE(SUM(o.quantity) FILTER(WHERE o.outcome = 1), 0) AS q2, "+
+			"    COALESCE(SUM(i.msats_received), 0) / 1000 AS volume "+
+			"  FROM orders o "+
+			"  JOIN invoices i ON o.invoice_id = i.id "+
+			"  WHERE i.confirmed_at IS NOT NULL "+
+			"  GROUP BY o.market_id"+
+			")"+
 			"SELECT m.id, m.question, m.description, m.created_at, m.end_date, "+
+			"m.lmsr_b, l.q1, l.q2, l.volume, "+
 			"u.id, u.name, u.created_at, u.ln_pubkey, u.nostr_pubkey, u.msats "+
 			"FROM markets m "+
 			"JOIN users u ON m.user_id = u.id "+
 			"JOIN invoices i ON m.invoice_id = i.id "+
+			"JOIN lmsr l ON m.id = l.market_id "+
 			"WHERE i.confirmed_at IS NOT NULL"); err != nil {
 			return err
 		}
@@ -32,12 +46,16 @@ func HandleIndex(sc context.Context) echo.HandlerFunc {
 		for rows.Next() {
 			var m types.Market
 			var u types.User
+			var l types.LMSR
 			if err = rows.Scan(
 				&m.Id, &m.Question, &m.Description, &m.CreatedAt, &m.EndDate,
+				&l.B, &l.Q1, &l.Q2, &m.Volume,
 				&u.Id, &u.Name, &u.CreatedAt, &u.LnPubkey, &u.NostrPubkey, &u.Msats); err != nil {
 				return err
 			}
 			m.User = u
+			m.Pyes = lmsr.Quote(l.B, l.Q2, l.Q1, 1)
+
 			markets = append(markets, m)
 		}
 

server/router/handler/market.go

@@ -99,29 +99,53 @@ func HandleCreate(sc context.Context) echo.HandlerFunc {
 func HandleMarket(sc context.Context) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		var (
-			db       = sc.Db
-			ctx      = c.Request().Context()
-			u        = types.User{}
-			id       = c.Param("id")
+			db  = sc.Db
+			ctx = c.Request().Context()
+
+			// session user
+			u = types.User{}
+
+			// market id
+			id = c.Param("id")
+
+			// quantity of shares user entered into form
 			quantity = c.QueryParam("q")
-			q        int64
-			m        = types.Market{}
-			mU       = types.User{}
-			l        = types.LMSR{}
-			total    float64
-			quote0   = types.MarketQuote{}
-			quote1   = types.MarketQuote{}
-			uQ0      int
-			uQ1      int
-			rows     *sql.Rows
-			p0       []types.MarketPoint
-			p1       []types.MarketPoint
-			err      error
+
+			// quantity as number
+			q int64
+
+			// current market
+			m = types.Market{}
+
+			// market founder
+			mU = types.User{}
+
+			// market LMSR data
+			l = types.LMSR{}
+
+			// total price for current quantity of shares in sats
+			total float64
+
+			// market quotes
+			quoteNo  = types.MarketQuote{}
+			quoteYes = types.MarketQuote{}
+
+			// how many shares the user already holds
+			uQuantityNo  int
+			uQuantityYes int
+			rows         *sql.Rows
+
+			// chart data
+			lineNo  []types.Point
+			lineYes []types.Point
+
+			err error
 		)
 
 		if c.Get("session") != nil {
 			u = c.Get("session").(types.User)
 		} else {
+			// unauthenticated user
 			u.Id = -1
 		}
 
@@ -149,6 +173,7 @@ func HandleMarket(sc context.Context) echo.HandlerFunc {
 
 		if err = db.QueryRowContext(ctx, ""+
 			"SELECT "+
+			"COALESCE(SUM(i.msats_received), 0) / 1000 AS volume, "+
 			"COALESCE(SUM(o.quantity) FILTER(WHERE o.outcome = 0), 0) AS q1, "+
 			"COALESCE(SUM(o.quantity) FILTER(WHERE o.outcome = 1), 0) AS q2, "+
 			"COALESCE(SUM(o.quantity) FILTER(WHERE o.outcome = 0 AND o.user_id = $2), 0) AS uq1, "+
@@ -167,14 +192,16 @@ func HandleMarket(sc context.Context) echo.HandlerFunc {
 			// but this isn't sybil resistant.
 			//
 			// For now, we will ignore pending orders.
-			"WHERE o.market_id = $1 AND i.confirmed_at IS NOT NULL", id, u.Id).Scan(
-			&l.Q1, &l.Q2, &uQ0, &uQ1); err != nil {
+			"WHERE o.market_id = $1 AND i.confirmed_at IS NOT NULL", id, u.Id).
+			Scan(&m.Volume, &l.Q1, &l.Q2, &uQuantityNo, &uQuantityYes); err != nil {
 			if err == sql.ErrNoRows {
 				return echo.NewHTTPError(http.StatusNotFound)
 			}
 			return err
 		}
 
+		m.Pyes = lmsr.Quote(l.B, l.Q2, l.Q1, 1)
+
 		if rows, err = db.QueryContext(ctx, ""+
 			"SELECT created_at, quote(b, q0, q1, 1) AS p0, quote(b, q1, q0, 1) AS p1 "+
 			"FROM ( "+
@@ -203,12 +230,12 @@ func HandleMarket(sc context.Context) echo.HandlerFunc {
 			if err = rows.Scan(&createdAt, &_p0, &_p1); err != nil {
 				return err
 			}
-			p0 = append(p0, types.MarketPoint{X: createdAt, Y: _p0})
-			p1 = append(p1, types.MarketPoint{X: createdAt, Y: _p1})
+			lineNo = append(lineNo, types.Point{X: createdAt, Y: _p0})
+			lineYes = append(lineYes, types.Point{X: createdAt, Y: _p1})
 		}
 
 		total = lmsr.Quote(l.B, l.Q1, l.Q2, int(q))
-		quote0 = types.MarketQuote{
+		quoteNo = types.MarketQuote{
 			Outcome:    0,
 			AvgPrice:   total / float64(q),
 			TotalPrice: total,
@@ -216,7 +243,7 @@ func HandleMarket(sc context.Context) echo.HandlerFunc {
 		}
 
 		total = lmsr.Quote(l.B, l.Q2, l.Q1, int(q))
-		quote1 = types.MarketQuote{
+		quoteYes = types.MarketQuote{
 			Outcome:    1,
 			AvgPrice:   total / float64(q),
 			TotalPrice: total,
@@ -225,39 +252,63 @@ func HandleMarket(sc context.Context) echo.HandlerFunc {
 
 		return pages.Market(
 			m,
-			p0, p1,
-			quote0, quote1,
-			uQ0, uQ1).Render(context.RenderContext(sc, c), c.Response().Writer)
+			lineNo, lineYes,
+			quoteNo, quoteYes,
+			uQuantityNo, uQuantityYes).Render(context.RenderContext(sc, c), c.Response().Writer)
 	}
 }
 
 func HandleOrder(sc context.Context) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		var (
-			db             = sc.Db
-			lnd            = sc.Lnd
-			tx             *sql.Tx
-			ctx            = c.Request().Context()
-			u              = c.Get("session").(types.User)
-			id             = c.Param("id")
-			quantity       = c.FormValue("q")
-			outcome        = c.FormValue("o")
-			q              int64
-			o              int64
-			m              = types.Market{}
-			mU             = types.User{}
-			l              = types.LMSR{}
-			totalF         float64
-			total          int
+			db  = sc.Db
+			lnd = sc.Lnd
+			tx  *sql.Tx
+			ctx = c.Request().Context()
+			u   = c.Get("session").(types.User)
+
+			// market id
+			id = c.Param("id")
+
+			// how many shares user wants to buy
+			quantity = c.FormValue("q")
+			// quantity as number
+			q int64
+
+			// on which outcome user wants to bet
+			outcome = c.FormValue("o")
+			// outcome as id
+			o int64
+
+			// selected market
+			m = types.Market{}
+
+			// market founder
+			mU = types.User{}
+
+			// market LMSR data
+			l = types.LMSR{}
+
+			// total price as returned by LMSR for given quantity
+			totalF float64
+			// total rounded to msats
+			total int
+
+			// invoice data
 			hash           lntypes.Hash
 			paymentRequest string
 			expiry         = int64(60)
 			expiresAt      = time.Now().Add(time.Second * time.Duration(expiry))
 			invoiceId      int
 			invDescription string
-			orderId        int
-			qr             templ.Component
-			err            error
+
+			// id of created order
+			orderId int
+
+			// QR component during render
+			qr templ.Component
+
+			err error
 		)
 
 		if quantity == "" {

server/router/pages/index.templ

@@ -36,8 +36,8 @@ templ Index(markets []types.Market) {
 									<a href={ templ.SafeURL(fmt.Sprintf("/market/%d", m.Id)) }>{ m.Question }</a>
 									<div class="text-small text-muted">{ m.User.Name } / { humanize.Time(m.CreatedAt) } / { humanize.Time(m.EndDate) }</div>
 								</span>
-								<span class="px-3 border-b border-muted pb-3 mt-3 flex"><div class="self-center">51%</div></span>
-								<span class="pe-3 border-b border-muted pb-3 mt-3 flex"><div class="self-center">0</div></span>
+								<span class={ fmt.Sprintf("%s %s", "px-3 border-b border-muted pb-3 mt-3 flex", colorize(m.Pyes)) }><div class="self-center">{ fmt.Sprintf("%.2f%%", m.Pyes * 100) }</div></span>
+								<span class="pe-3 border-b border-muted pb-3 mt-3 flex"><div class="self-center">{ fmt.Sprintf("%s", humanizeRound(m.Volume)) }</div></span>
 							}
 						</div>
 					} else {
@@ -92,6 +92,25 @@ func minDate() string {
 	return time.Now().Add(24 * time.Hour).Format("2006-01-02")
 }
 
+func humanizeRound(f float64) string {
+	if f > 1_000_000 {
+		return fmt.Sprintf("%.2fm", f/1_000_000)
+	} else if f > 1_000 {
+		return fmt.Sprintf("%.2fk", f/1_000)
+	} else {
+		return fmt.Sprintf("%.2f", f)
+	}
+}
+
+func colorize(f float64) string {
+	if f > 0.5 {
+		return "text-success"
+	} else {
+		return "text-error"
+	}
+
+}
+
 func tabStyle(path string, tab string) string {
 	class := "!no-underline"
 	if path == tab {

server/router/pages/market.templ

@@ -7,7 +7,7 @@ import (
 )
 
 // TODO: Add countdown? Use or at least show somewhere precise timestamps?
-templ Market(m types.Market, p0 []types.MarketPoint, p1 []types.MarketPoint, q0 types.MarketQuote, q1 types.MarketQuote, uQ0 int, uQ1 int) {
+templ Market(m types.Market, p0 []types.Point, p1 []types.Point, quoteNo types.MarketQuote, quoteYes types.MarketQuote, uQuantityNo int, uQuantityYes int) {
 	<html>
 		@components.Head()
 		<body
@@ -54,10 +54,10 @@ templ Market(m types.Market, p0 []types.MarketPoint, p1 []types.MarketPoint, q0
 						</button>
 					</div>
 					<div class="mx-auto my-5" x-show="outcome === 1">
-						@components.MarketForm(m, 1, q1, uQ1)
+						@components.MarketForm(m, 1, quoteYes, uQuantityYes)
 					</div>
 					<div class="mx-auto my-5" x-show="outcome === 0">
-						@components.MarketForm(m, 0, q0, uQ0)
+						@components.MarketForm(m, 0, quoteNo, uQuantityNo)
 					</div>
 				</div>
 			</div>

types/types.go

@@ -36,6 +36,9 @@ type Market struct {
 	Description string
 	CreatedAt   time.Time
 	EndDate     time.Time
+	Pyes        float64
+	// market volume in sats
+	Volume float64
 }
 
 type LMSR struct {
@@ -51,7 +54,7 @@ type MarketQuote struct {
 	Reward     float64
 }
 
-type MarketPoint struct {
+type Point struct {
 	X time.Time
 	Y float64
 }