@moneypot/hub 1.3.0-dev.9 → 1.3.0

package/dist/src/db/index.d.ts

@@ -2,6 +2,7 @@ import * as pg from "pg";
 import stream from "node:stream";
 import { DbCasino, DbExperience, DbSession, DbTransferStatusKind, DbUser, DbWithdrawal } from "./types.js";
 import { TransferStatusKind } from "../__generated__/graphql.js";
+export * from "../hash-chain/db-hash-chain.js";
 export * from "./types.js";
 export * from "./public.js";
 export * from "./util.js";

package/dist/src/db/index.js

@@ -5,6 +5,7 @@ import { exactlyOneRow, maybeOneRow } from "./util.js";
 import { logger } from "../logger.js";
 import { setTimeout } from "node:timers/promises";
 import { assert } from "tsafe";
+export * from "../hash-chain/db-hash-chain.js";
 export * from "./types.js";
 export * from "./public.js";
 export * from "./util.js";

package/dist/src/hash-chain/db-hash-chain.d.ts

@@ -1,12 +1,12 @@
 import { DbCasino, DbExperience, DbHash, DbHashChain, DbUser } from "../db/types.js";
 import { PgClientInTransaction } from "../db/index.js";
-export declare function dbLockHashChain(pgClient: PgClientInTransaction, { userId, experienceId, casinoId, hashChainId, }: {
+export declare function dbLockHubHashChain(pgClient: PgClientInTransaction, { userId, experienceId, casinoId, hashChainId, }: {
     userId: DbUser["id"];
     experienceId: DbExperience["id"];
     casinoId: DbCasino["id"];
     hashChainId: DbHashChain["id"];
 }): Promise<DbHashChain | null>;
-export declare function dbInsertHash(pgClient: PgClientInTransaction, { hashChainId, kind, digest, iteration, metadata, }: {
+export declare function dbInsertHubHash(pgClient: PgClientInTransaction, { hashChainId, kind, digest, iteration, metadata, }: {
     hashChainId: DbHashChain["id"];
     kind: DbHash["kind"];
     digest: DbHash["digest"];

package/dist/src/hash-chain/db-hash-chain.js

@@ -1,7 +1,7 @@
 import { exactlyOneRow, maybeOneRow, } from "../db/index.js";
 import { assert } from "tsafe";
-export async function dbLockHashChain(pgClient, { userId, experienceId, casinoId, hashChainId, }) {
-    assert(pgClient._inTransaction, "dbLockHashChain must be called in a transaction");
+export async function dbLockHubHashChain(pgClient, { userId, experienceId, casinoId, hashChainId, }) {
+    assert(pgClient._inTransaction, "dbLockHubHashChain must be called in a transaction");
     return pgClient
         .query(`
        SELECT * 
@@ -17,7 +17,7 @@ export async function dbLockHashChain(pgClient, { userId, experienceId, casinoId
         .then(maybeOneRow)
         .then((row) => row ?? null);
 }
-export async function dbInsertHash(pgClient, { hashChainId, kind, digest, iteration, metadata = {}, }) {
+export async function dbInsertHubHash(pgClient, { hashChainId, kind, digest, iteration, metadata = {}, }) {
     assert(pgClient._inTransaction, "dbInsertHash must be called in a transaction");
     return pgClient
         .query(`

package/dist/src/plugins/hub-make-outcome-bet.d.ts

@@ -4,11 +4,11 @@ declare const OutcomeSchema: z.ZodObject<{
     weight: z.ZodNumber;
     profit: z.ZodNumber;
 }, "strict", z.ZodTypeAny, {
-    weight: number;
     profit: number;
-}, {
     weight: number;
+}, {
     profit: number;
+    weight: number;
 }>;
 declare const InputSchema: z.ZodObject<{
     kind: z.ZodString;
@@ -18,53 +18,53 @@ declare const InputSchema: z.ZodObject<{
         weight: z.ZodNumber;
         profit: z.ZodNumber;
     }, "strict", z.ZodTypeAny, {
-        weight: number;
         profit: number;
-    }, {
         weight: number;
+    }, {
         profit: number;
-    }>, "many">, {
         weight: number;
+    }>, "many">, {
         profit: number;
-    }[], {
         weight: number;
+    }[], {
         profit: number;
-    }[]>, {
         weight: number;
+    }[]>, {
         profit: number;
-    }[], {
         weight: number;
+    }[], {
         profit: number;
+        weight: number;
     }[]>;
     hashChainId: z.ZodString;
-    metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, "strict", z.ZodTypeAny, {
     currency: string;
-    kind: string;
     hashChainId: string;
+    kind: string;
     wager: number;
     outcomes: {
-        weight: number;
         profit: number;
+        weight: number;
     }[];
-    metadata?: Record<string, any> | undefined;
+    metadata?: Record<string, unknown> | undefined;
 }, {
     currency: string;
-    kind: string;
     hashChainId: string;
+    kind: string;
     wager: number;
     outcomes: {
-        weight: number;
         profit: number;
+        weight: number;
     }[];
-    metadata?: Record<string, any> | undefined;
+    metadata?: Record<string, unknown> | undefined;
 }>;
 type Input = z.infer<typeof InputSchema>;
-type InputWithoutMetadata = Omit<Input, "metadata"> & {
-    metadata?: never;
-};
 type Outcome = z.infer<typeof OutcomeSchema>;
+type Metadata = NonNullable<Input["metadata"]>;
 type FinalizeMetadataData = {
+    wager: number;
+    currencyKey: string;
     clientSeed: string;
     hash: Uint8Array;
     outcomes: Outcome[];
@@ -73,8 +73,8 @@ type FinalizeMetadataData = {
 export type OutcomeBetConfig = {
     houseEdge: number;
     saveOutcomes: boolean;
-    validateUntrustedMetadata?: (input: Input) => Result<Record<string, any>, string>;
-    finalizeMetadata?: (input: InputWithoutMetadata, validatedMetadata: Record<string, any>, data: FinalizeMetadataData) => Record<string, any>;
+    initializeMetadataFromUntrustedUserInput?: (input: Input) => Result<Metadata, string>;
+    finalizeMetadata?: (validatedMetadata: Metadata, data: FinalizeMetadataData) => Metadata;
 };
 export type OutcomeBetConfigMap<BetKind extends string> = {
     [betKind in BetKind]: OutcomeBetConfig;

package/dist/src/plugins/hub-make-outcome-bet.js

@@ -4,8 +4,9 @@ import { z } from "zod";
 import { GraphQLError } from "graphql";
 import { DbHashKind, exactlyOneRow, maybeOneRow, superuserPool, withPgPoolTransaction, } from "../db/index.js";
 import { assert } from "tsafe";
-import { dbInsertHash, dbLockHashChain } from "../hash-chain/db-hash-chain.js";
+import { dbInsertHubHash, dbLockHubHashChain, } from "../hash-chain/db-hash-chain.js";
 import { getIntermediateHash, getPreimageHash, } from "../hash-chain/get-hash.js";
+import { createHmac } from "node:crypto";
 const FLOAT_EPSILON = 1e-10;
 function sum(ns) {
     return ns.reduce((a, b) => a + b, 0);
@@ -38,7 +39,7 @@ const InputSchema = z
         .refine((data) => data.some((o) => o.profit < 0), "At least one outcome should have profit < 0")
         .refine((data) => data.some((o) => o.profit > 0), "At least one outcome should have profit > 0"),
     hashChainId: z.string().uuid("Invalid hash chain ID"),
-    metadata: z.record(z.string(), z.any()).optional(),
+    metadata: z.record(z.string(), z.unknown()).optional(),
 })
     .strict();
 const BetKindSchema = z
@@ -52,7 +53,7 @@ const BetConfigsSchema = z.record(BetKindSchema, z.object({
         .gte(0, "House edge must be >= 0")
         .lte(1, "House edge must be <= 1"),
     saveOutcomes: z.boolean(),
-    validateUntrustedMetadata: z
+    initializeMetadataFromUntrustedUserInput: z
         .function()
         .optional(),
     finalizeMetadata: z
@@ -78,11 +79,11 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
           metadata: JSON
         }
 
-        type HubMakeOutcomeBetOk {
+        type HubMakeOutcomeBetSuccess {
           bet: HubOutcomeBet!
         }
 
-        union HubMakeOutcomeBetResult = HubMakeOutcomeBetOk | HubBadHashChainError
+        union HubMakeOutcomeBetResult = HubMakeOutcomeBetSuccess | HubBadHashChainError
 
         type HubMakeOutcomeBetPayload {
           result: HubMakeOutcomeBetResult!
@@ -118,17 +119,14 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                             if (!betConfig) {
                                 throw new GraphQLError(`Invalid bet kind`);
                             }
-                            if (!betKinds.includes(rawInput.kind)) {
-                                throw new GraphQLError(`Invalid bet kind`);
-                            }
-                            let validatedMetadata;
-                            if (betConfig.validateUntrustedMetadata) {
-                                const result = betConfig.validateUntrustedMetadata(input);
+                            let initializedMetadata;
+                            if (betConfig.initializeMetadataFromUntrustedUserInput) {
+                                const result = betConfig.initializeMetadataFromUntrustedUserInput(input);
                                 if (result.ok) {
-                                    validatedMetadata = result.value;
+                                    initializedMetadata = result.value;
                                 }
                                 else {
-                                    throw new GraphQLError(`Invalid metadata: ${result.error}`);
+                                    throw new GraphQLError(`Invalid input: ${result.error}`);
                                 }
                             }
                             const houseEV = calculateHouseEV(input.outcomes);
@@ -181,7 +179,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                 if (maxPotentialPayout > maxAllowablePayout) {
                                     throw new GraphQLError(`House risk limit exceeded. Max payout: ${maxPotentialPayout.toFixed(4)}`);
                                 }
-                                const dbHashChain = await dbLockHashChain(pgClient, {
+                                const dbHashChain = await dbLockHubHashChain(pgClient, {
                                     userId: session.user_id,
                                     experienceId: session.experience_id,
                                     casinoId: session.casino_id,
@@ -225,7 +223,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                         throw new Error(`Unknown bet hash result: ${_exhaustiveCheck}`);
                                     }
                                 }
-                                await dbInsertHash(pgClient, {
+                                await dbInsertHubHash(pgClient, {
                                     hashChainId: dbHashChain.id,
                                     kind: DbHashKind.INTERMEDIATE,
                                     digest: betHashResult.hash,
@@ -239,7 +237,18 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                 if (result.rowCount !== 1) {
                                     throw new GraphQLError("Failed to update hash chain iteration");
                                 }
-                                const { outcome, outcomeIdx } = pickRandomOutcome(input.outcomes, betHashResult.hash);
+                                const finalHash = (() => {
+                                    const serverHash = betHashResult.hash;
+                                    const clientSeed = dbHashChain.client_seed;
+                                    const finalHash = createHmac("sha256", serverHash)
+                                        .update(clientSeed)
+                                        .digest();
+                                    return finalHash;
+                                })();
+                                const { outcome, outcomeIdx } = pickRandomOutcome({
+                                    outcomes: input.outcomes,
+                                    hash: finalHash,
+                                });
                                 const netPlayerAmount = input.wager * outcome.profit;
                                 await pgClient.query({
                                     text: `
@@ -275,14 +284,16 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                     ],
                                 });
                                 const immutableData = structuredClone({
+                                    wager: input.wager,
+                                    currencyKey: dbCurrency.key,
                                     clientSeed: dbHashChain.client_seed,
                                     hash: betHashResult.hash,
                                     outcomes: input.outcomes,
                                     outcomeIdx,
                                 });
                                 const finalizedMetadata = betConfig.finalizeMetadata
-                                    ? betConfig.finalizeMetadata(withoutKey(input, "metadata"), validatedMetadata, immutableData)
-                                    : validatedMetadata;
+                                    ? betConfig.finalizeMetadata(initializedMetadata, immutableData)
+                                    : initializedMetadata;
                                 const newBet = {
                                     kind: rawInput.kind,
                                     wager: input.wager,
@@ -338,7 +349,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                                 })
                                     .then(exactlyOneRow);
                                 return {
-                                    __typename: "HubMakeOutcomeBetOk",
+                                    __typename: "HubMakeOutcomeBetSuccess",
                                     betId: bet.id,
                                 };
                             });
@@ -348,7 +359,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                         });
                     },
                 },
-                HubMakeOutcomeBetOk: {
+                HubMakeOutcomeBetSuccess: {
                     __assertStep: ObjectStep,
                     bet($data) {
                         const $betId = access($data, "betId");
@@ -360,7 +371,7 @@ export function MakeOutcomeBetPlugin({ betConfigs }) {
                     result($data) {
                         const $result = $data.get("result");
                         return polymorphicBranch($result, {
-                            HubMakeOutcomeBetOk: {},
+                            HubMakeOutcomeBetSuccess: {},
                             HubBadHashChainError: {},
                         });
                     },
@@ -375,7 +386,7 @@ function normalizeHash(hash) {
     const uint32Value = view.getUint32(0, false);
     return uint32Value / Math.pow(2, 32);
 }
-function pickRandomOutcome(outcomes, hash) {
+function pickRandomOutcome({ outcomes, hash, }) {
     assert(outcomes.length >= 2, "Outcome count must be >= 2");
     const totalWeight = sum(outcomes.map((o) => o.weight));
     const outcomesWithProbability = outcomes.map((o) => ({
@@ -449,7 +460,7 @@ async function finishHashChainInBackground({ hashChainId, }) {
             iteration: 0,
         });
         await withPgPoolTransaction(superuserPool, async (pgClient) => {
-            await dbInsertHash(pgClient, {
+            await dbInsertHubHash(pgClient, {
                 hashChainId,
                 kind: DbHashKind.PREIMAGE,
                 digest: preimageHashResult.hash,
@@ -473,7 +484,3 @@ async function finishHashChainInBackground({ hashChainId, }) {
         });
     }
 }
-function withoutKey(obj, key) {
-    const { [key]: _, ...rest } = obj;
-    return rest;
-}

package/dist/src/plugins/hub-outcome-input-non-null-fields.d.ts

@@ -0,0 +1,18 @@
+import { GraphQLInputFieldConfig } from "graphql";
+export declare const HubOutcomeInputNonNullFieldsPlugin: {
+    name: string;
+    version: string;
+    description: string;
+    schema: {
+        hooks: {
+            GraphQLInputObjectType_fields_field: (field: GraphQLInputFieldConfig, build: any, context: any) => {
+                type: any;
+                description?: import("graphql/jsutils/Maybe.js").Maybe<string>;
+                defaultValue?: unknown;
+                deprecationReason?: import("graphql/jsutils/Maybe.js").Maybe<string>;
+                extensions?: import("graphql/jsutils/Maybe.js").Maybe<Readonly<import("graphql").GraphQLInputFieldExtensions>>;
+                astNode?: import("graphql/jsutils/Maybe.js").Maybe<import("graphql").InputValueDefinitionNode>;
+            };
+        };
+    };
+};

package/dist/src/plugins/hub-outcome-input-non-null-fields.js

@@ -0,0 +1,20 @@
+export const HubOutcomeInputNonNullFieldsPlugin = {
+    name: "HubOutcomeInputNonNullFieldsPlugin",
+    version: "0.0.0",
+    description: "Specifies that HubOutcomeInput fields are non-null",
+    schema: {
+        hooks: {
+            GraphQLInputObjectType_fields_field: (field, build, context) => {
+                const { scope: { fieldName }, } = context;
+                if (context.scope.pgCodec?.name === "hubOutcome" &&
+                    ["profit", "weight"].includes(fieldName)) {
+                    return {
+                        ...field,
+                        type: new build.graphql.GraphQLNonNull(field.type),
+                    };
+                }
+                return field;
+            },
+        },
+    },
+};

package/dist/src/plugins/hub-user-balance-by-currency.js

@@ -1,55 +1,30 @@
-import { access, context, loadOne, object, } from "postgraphile/grafast";
+import { access, constant, context } from "postgraphile/grafast";
 import { gql, makeExtendSchemaPlugin } from "postgraphile/utils";
-import { superuserPool } from "../db/index.js";
-import { pgSelectSingleFromRecord, } from "postgraphile/@dataplan/pg";
+import { TYPES } from "postgraphile/@dataplan/pg";
+import { sql } from "postgraphile/pg-sql2";
 export const HubUserBalanceByCurrencyPlugin = makeExtendSchemaPlugin((build) => {
-    const balances = build.input.pgRegistry.pgResources.hub_balance;
+    const balanceTable = build.input.pgRegistry.pgResources.hub_balance;
     return {
         typeDefs: gql `
         extend type HubUser {
-          balanceByCurrency(currency: String!): HubBalance
+          hubBalanceByCurrency(currency: String!): HubBalance
         }
       `,
         plans: {
             HubUser: {
-                balanceByCurrency: ($record, { $currency }) => {
+                hubBalanceByCurrency: ($record, { $currency }) => {
                     const $identity = context().get("identity");
-                    const $params = object({
-                        currency: $currency,
-                        targetUserId: $record.get("id"),
-                        casino_id: access($identity, ["session", "casino_id"]),
-                        experience_id: access($identity, ["session", "experience_id"]),
-                    });
-                    const $balance = loadOne($params, batchGetUserBalanceByCurrency);
-                    return pgSelectSingleFromRecord(balances, $balance);
+                    const $balances = balanceTable.find();
+                    $balances.where(sql `
+              ${$balances}.currency_key = ${$balances.placeholder($currency, TYPES.text)}
+              AND ${$balances}.user_id = ${$balances.placeholder($record.get("id"), TYPES.uuid)}
+              AND ${$balances}.casino_id = ${$balances.placeholder(access($identity, ["session", "casino_id"]), TYPES.uuid)}
+              AND ${$balances}.experience_id = ${$balances.placeholder(access($identity, ["session", "experience_id"]), TYPES.uuid)}
+            `);
+                    $balances.setFirst(constant(1));
+                    return $balances.single();
                 },
             },
         },
     };
 });
-async function batchGetUserBalanceByCurrency(paramsArray) {
-    const values = [];
-    const valuePlaceholders = [];
-    paramsArray.forEach((p, index) => {
-        const baseIndex = index * 4 + 1;
-        valuePlaceholders.push(`($${baseIndex}, $${baseIndex + 1}::uuid, $${baseIndex + 2}::uuid, $${baseIndex + 3}::uuid)`);
-        values.push(p.currency, p.targetUserId, p.casino_id, p.experience_id);
-    });
-    const sql = `
-    SELECT b.*
-    FROM hub.balance b
-    JOIN (
-      VALUES
-        ${valuePlaceholders.join(",\n        ")}
-    ) AS vals(currency_key, user_id, casino_id, experience_id)
-    ON b.currency_key = vals.currency_key
-    AND b.user_id = vals.user_id
-    AND b.casino_id = vals.casino_id
-    AND b.experience_id = vals.experience_id
-  `;
-    const { rows } = await superuserPool.query(sql, values);
-    return paramsArray.map((p) => rows.find((row) => row.currency_key === p.currency &&
-        row.user_id === p.targetUserId &&
-        row.casino_id === p.casino_id &&
-        row.experience_id === p.experience_id));
-}

package/dist/src/server/graphile.config.js

@@ -23,6 +23,7 @@ import { HubCurrentXPlugin } from "../plugins/hub-current-x.js";
 import { HubCreateHashChainPlugin } from "../hash-chain/plugins/hub-create-hash-chain.js";
 import { HubBadHashChainErrorPlugin } from "../hash-chain/plugins/hub-bad-hash-chain-error.js";
 import { HubUserActiveHashChainPlugin } from "../hash-chain/plugins/hub-user-active-hash-chain.js";
+import { HubOutcomeInputNonNullFieldsPlugin } from "../plugins/hub-outcome-input-non-null-fields.js";
 export const requiredPlugins = [
     SmartTagsPlugin,
     IdToNodeIdPlugin,
@@ -38,6 +39,7 @@ export const requiredPlugins = [
 export const defaultPlugins = [
     ...(config.NODE_ENV === "development" ? [DebugPlugin] : []),
     ...requiredPlugins,
+    HubOutcomeInputNonNullFieldsPlugin,
     HubBadHashChainErrorPlugin,
     HubCreateHashChainPlugin,
     HubUserActiveHashChainPlugin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneypot/hub",
-  "version": "1.3.0-dev.9",
+  "version": "1.3.0",
   "author": "moneypot.com",
   "homepage": "https://moneypot.com/hub",
   "keywords": [