@r2wa-org/eden 0.0.79 → 0.0.81

package/dist/trade-market/internal/service.d.ts

@@ -1,14 +1,12 @@
-import Decimal from "decimal.js";
-import { assetPrice } from "../../asset-price/schema";
-import type { TransactionTx } from "../../db/transaction";
-import { ledgerAccount } from "../../ledger-account/schema";
-import { tradeMarket, tradeMarketOrder } from "../schema";
+import Decimal from 'decimal.js';
+import type { TransactionTx } from '../../db/transaction';
+import { assetPrice } from '../../asset-price/schema';
+import { ledgerAccount } from '../../ledger-account/schema';
+import { tradeMarket, tradeMarketOrder } from '../schema';
 interface ExecuteMarketOrderInput {
     marketId: string;
-    side: "buy" | "sell";
+    side: 'buy' | 'sell';
     baseAmount: string;
-    userBaseAccountId: string;
-    userQuoteAccountId: string;
     idempotencyKey: string;
 }
 export declare abstract class BaseTradeMarketService {
@@ -22,9 +20,6 @@ export declare abstract class BaseTradeMarketService {
         status: "active" | "draft" | "paused" | "ended";
         baseAssetId: string;
         quoteAssetId: string;
-        pricingSource: string;
-        systemBaseAccountId: string;
-        systemQuoteAccountId: string;
         isBuyEnabled: boolean;
         isSellEnabled: boolean;
         minBaseAmount: string;
@@ -33,10 +28,15 @@ export declare abstract class BaseTradeMarketService {
         dailyUserSellBaseLimit: string | null;
         maxSlippageBps: string;
     }>;
-    protected static assertMarketAvailable(market: typeof tradeMarket.$inferSelect, side: "buy" | "sell"): void;
+    protected static assertMarketAvailable(market: typeof tradeMarket.$inferSelect, side: 'buy' | 'sell'): void;
     protected static assertBaseAmountRange(baseAmount: Decimal, market: typeof tradeMarket.$inferSelect): void;
     protected static getLatestEffectivePrice(tx: TransactionTx, market: typeof tradeMarket.$inferSelect): Promise<typeof assetPrice.$inferSelect>;
-    protected static getUserAccounts(tx: TransactionTx, userId: string, userBaseAccountId: string, userQuoteAccountId: string): Promise<{
+    protected static getLedgerAccountTypeId(tx: TransactionTx, key: 'BALANCE' | 'WITHDRAW_ACCOUNT' | 'EARNING' | 'LOCKED'): Promise<string>;
+    protected static resolveUserAccountsBySide(tx: TransactionTx, params: {
+        userId: string;
+        market: typeof tradeMarket.$inferSelect;
+        side: 'buy' | 'sell';
+    }): Promise<{
         userBaseAccount: {
             id: string;
             createdAt: Date;
@@ -62,38 +62,10 @@ export declare abstract class BaseTradeMarketService {
             version: number;
         };
     }>;
-    protected static getSystemAccounts(tx: TransactionTx, market: typeof tradeMarket.$inferSelect): Promise<{
-        systemBaseAccount: {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            userId: string;
-            status: "active" | "frozen" | "disabled";
-            assetId: string;
-            ledgerAccountTypeId: string;
-            available: string;
-            locked: string;
-            version: number;
-        };
-        systemQuoteAccount: {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            userId: string;
-            status: "active" | "frozen" | "disabled";
-            assetId: string;
-            ledgerAccountTypeId: string;
-            available: string;
-            locked: string;
-            version: number;
-        };
-    }>;
     protected static assertAccountAssetMatch(params: {
         market: typeof tradeMarket.$inferSelect;
         userBaseAccount: typeof ledgerAccount.$inferSelect;
         userQuoteAccount: typeof ledgerAccount.$inferSelect;
-        systemBaseAccount: typeof ledgerAccount.$inferSelect;
-        systemQuoteAccount: typeof ledgerAccount.$inferSelect;
     }): void;
     protected static getDayRangeUtc(date: Date): {
         dayStart: Date;
@@ -102,7 +74,7 @@ export declare abstract class BaseTradeMarketService {
     protected static assertDailyLimit(tx: TransactionTx, params: {
         userId: string;
         market: typeof tradeMarket.$inferSelect;
-        side: "buy" | "sell";
+        side: 'buy' | 'sell';
         baseAmount: Decimal;
         now: Date;
     }): Promise<void>;
@@ -111,7 +83,7 @@ export declare abstract class BaseTradeMarketService {
 export declare abstract class InternalTradeMarketService extends BaseTradeMarketService {
     private static marketWithRelationsQuery;
     static listMarkets(query?: {
-        status?: "draft" | "active" | "paused" | "ended";
+        status?: 'draft' | 'active' | 'paused' | 'ended';
         limit?: number;
         offset?: number;
     }): Promise<{
@@ -123,9 +95,6 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
             status: "active" | "draft" | "paused" | "ended";
             baseAssetId: string;
             quoteAssetId: string;
-            pricingSource: string;
-            systemBaseAccountId: string;
-            systemQuoteAccountId: string;
             isBuyEnabled: boolean;
             isSellEnabled: boolean;
             minBaseAmount: string;
@@ -134,7 +103,7 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
             dailyUserSellBaseLimit: string | null;
             maxSlippageBps: string;
             baseAsset: {
-                symbol: string;
+                symbol: string | null;
                 id: string;
                 name: string;
                 createdAt: Date;
@@ -143,11 +112,11 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
                 iconUrl: string;
                 category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
                 isActive: boolean;
-                typeId: string;
+                typeId: string | null;
                 precision: number;
             };
             quoteAsset: {
-                symbol: string;
+                symbol: string | null;
                 id: string;
                 name: string;
                 createdAt: Date;
@@ -156,145 +125,9 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
                 iconUrl: string;
                 category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
                 isActive: boolean;
-                typeId: string;
+                typeId: string | null;
                 precision: number;
             };
-            systemBaseAccount: {
-                id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                userId: string;
-                status: "active" | "frozen" | "disabled";
-                assetId: string;
-                ledgerAccountTypeId: string;
-                available: string;
-                locked: string;
-                version: number;
-                user: {
-                    email: string;
-                    id: string;
-                    name: string;
-                    emailVerified: boolean;
-                    image: string | null;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    twoFactorEnabled: boolean | null;
-                    username: string | null;
-                    displayUsername: string | null;
-                    phoneNumber: string | null;
-                    phoneNumberVerified: boolean | null;
-                    role: string | null;
-                    banned: boolean | null;
-                    banReason: string | null;
-                    banExpires: Date | null;
-                };
-                asset: {
-                    symbol: string;
-                    id: string;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    code: string;
-                    iconUrl: string;
-                    category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
-                    isActive: boolean;
-                    typeId: string;
-                    precision: number;
-                };
-                ledgerAccountType: {
-                    id: string;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    description: string | null;
-                    key: string;
-                    isActive: boolean;
-                    allowDeposit: boolean;
-                    allowWithdraw: boolean;
-                    minWithdrawAmount: string;
-                    maxWithdrawAmount: string;
-                    allowTransfer: boolean;
-                    minTransferAmount: string;
-                    maxTransferAmount: string;
-                    allowInternalTransfer: boolean;
-                    allowInternalReceiveTransfer: boolean;
-                    minInternalTransferAmount: string;
-                    maxInternalTransferAmount: string;
-                    internalTransferRatio: string;
-                    allowTransaction: boolean;
-                    hasExpiry: boolean;
-                    expiryDays: number | null;
-                    sortOrder: number;
-                };
-            };
-            systemQuoteAccount: {
-                id: string;
-                createdAt: Date;
-                updatedAt: Date;
-                userId: string;
-                status: "active" | "frozen" | "disabled";
-                assetId: string;
-                ledgerAccountTypeId: string;
-                available: string;
-                locked: string;
-                version: number;
-                user: {
-                    email: string;
-                    id: string;
-                    name: string;
-                    emailVerified: boolean;
-                    image: string | null;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    twoFactorEnabled: boolean | null;
-                    username: string | null;
-                    displayUsername: string | null;
-                    phoneNumber: string | null;
-                    phoneNumberVerified: boolean | null;
-                    role: string | null;
-                    banned: boolean | null;
-                    banReason: string | null;
-                    banExpires: Date | null;
-                };
-                asset: {
-                    symbol: string;
-                    id: string;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    code: string;
-                    iconUrl: string;
-                    category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
-                    isActive: boolean;
-                    typeId: string;
-                    precision: number;
-                };
-                ledgerAccountType: {
-                    id: string;
-                    name: string;
-                    createdAt: Date;
-                    updatedAt: Date;
-                    description: string | null;
-                    key: string;
-                    isActive: boolean;
-                    allowDeposit: boolean;
-                    allowWithdraw: boolean;
-                    minWithdrawAmount: string;
-                    maxWithdrawAmount: string;
-                    allowTransfer: boolean;
-                    minTransferAmount: string;
-                    maxTransferAmount: string;
-                    allowInternalTransfer: boolean;
-                    allowInternalReceiveTransfer: boolean;
-                    minInternalTransferAmount: string;
-                    maxInternalTransferAmount: string;
-                    internalTransferRatio: string;
-                    allowTransaction: boolean;
-                    hasExpiry: boolean;
-                    expiryDays: number | null;
-                    sortOrder: number;
-                };
-            };
         }[];
         total: number;
     }>;
@@ -306,9 +139,6 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
         status: "active" | "draft" | "paused" | "ended";
         baseAssetId: string;
         quoteAssetId: string;
-        pricingSource: string;
-        systemBaseAccountId: string;
-        systemQuoteAccountId: string;
         isBuyEnabled: boolean;
         isSellEnabled: boolean;
         minBaseAmount: string;
@@ -317,7 +147,7 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
         dailyUserSellBaseLimit: string | null;
         maxSlippageBps: string;
         baseAsset: {
-            symbol: string;
+            symbol: string | null;
             id: string;
             name: string;
             createdAt: Date;
@@ -326,11 +156,11 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
             iconUrl: string;
             category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
             isActive: boolean;
-            typeId: string;
+            typeId: string | null;
             precision: number;
         };
         quoteAsset: {
-            symbol: string;
+            symbol: string | null;
             id: string;
             name: string;
             createdAt: Date;
@@ -339,145 +169,9 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
             iconUrl: string;
             category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
             isActive: boolean;
-            typeId: string;
+            typeId: string | null;
             precision: number;
         };
-        systemBaseAccount: {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            userId: string;
-            status: "active" | "frozen" | "disabled";
-            assetId: string;
-            ledgerAccountTypeId: string;
-            available: string;
-            locked: string;
-            version: number;
-            user: {
-                email: string;
-                id: string;
-                name: string;
-                emailVerified: boolean;
-                image: string | null;
-                createdAt: Date;
-                updatedAt: Date;
-                twoFactorEnabled: boolean | null;
-                username: string | null;
-                displayUsername: string | null;
-                phoneNumber: string | null;
-                phoneNumberVerified: boolean | null;
-                role: string | null;
-                banned: boolean | null;
-                banReason: string | null;
-                banExpires: Date | null;
-            };
-            asset: {
-                symbol: string;
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                code: string;
-                iconUrl: string;
-                category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
-                isActive: boolean;
-                typeId: string;
-                precision: number;
-            };
-            ledgerAccountType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                key: string;
-                isActive: boolean;
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowInternalTransfer: boolean;
-                allowInternalReceiveTransfer: boolean;
-                minInternalTransferAmount: string;
-                maxInternalTransferAmount: string;
-                internalTransferRatio: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                sortOrder: number;
-            };
-        };
-        systemQuoteAccount: {
-            id: string;
-            createdAt: Date;
-            updatedAt: Date;
-            userId: string;
-            status: "active" | "frozen" | "disabled";
-            assetId: string;
-            ledgerAccountTypeId: string;
-            available: string;
-            locked: string;
-            version: number;
-            user: {
-                email: string;
-                id: string;
-                name: string;
-                emailVerified: boolean;
-                image: string | null;
-                createdAt: Date;
-                updatedAt: Date;
-                twoFactorEnabled: boolean | null;
-                username: string | null;
-                displayUsername: string | null;
-                phoneNumber: string | null;
-                phoneNumberVerified: boolean | null;
-                role: string | null;
-                banned: boolean | null;
-                banReason: string | null;
-                banExpires: Date | null;
-            };
-            asset: {
-                symbol: string;
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                code: string;
-                iconUrl: string;
-                category: "FIAT" | "CRYPTO" | "POINT" | "RWA";
-                isActive: boolean;
-                typeId: string;
-                precision: number;
-            };
-            ledgerAccountType: {
-                id: string;
-                name: string;
-                createdAt: Date;
-                updatedAt: Date;
-                description: string | null;
-                key: string;
-                isActive: boolean;
-                allowDeposit: boolean;
-                allowWithdraw: boolean;
-                minWithdrawAmount: string;
-                maxWithdrawAmount: string;
-                allowTransfer: boolean;
-                minTransferAmount: string;
-                maxTransferAmount: string;
-                allowInternalTransfer: boolean;
-                allowInternalReceiveTransfer: boolean;
-                minInternalTransferAmount: string;
-                maxInternalTransferAmount: string;
-                internalTransferRatio: string;
-                allowTransaction: boolean;
-                hasExpiry: boolean;
-                expiryDays: number | null;
-                sortOrder: number;
-            };
-        };
     }>;
     static getOrderByIdForUser(userId: string, orderId: string): Promise<{
         id: string;
@@ -498,14 +192,12 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
         pricingSourceSnapshot: string;
         userBaseAccountId: string;
         userQuoteAccountId: string;
-        systemBaseAccountIdSnapshot: string;
-        systemQuoteAccountIdSnapshot: string;
         userDebitLedgerEntryId: string | null;
         userCreditLedgerEntryId: string | null;
     }>;
     static listOrdersForUser(userId: string, query?: {
-        status?: "created" | "completed" | "failed";
-        side?: "buy" | "sell";
+        status?: 'created' | 'completed' | 'failed';
+        side?: 'buy' | 'sell';
         marketId?: string;
         limit?: number;
         offset?: number;
@@ -529,8 +221,6 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
             pricingSourceSnapshot: string;
             userBaseAccountId: string;
             userQuoteAccountId: string;
-            systemBaseAccountIdSnapshot: string;
-            systemQuoteAccountIdSnapshot: string;
             userDebitLedgerEntryId: string | null;
             userCreditLedgerEntryId: string | null;
         }[];
@@ -555,8 +245,6 @@ export declare abstract class InternalTradeMarketService extends BaseTradeMarket
         pricingSourceSnapshot: string;
         userBaseAccountId: string;
         userQuoteAccountId: string;
-        systemBaseAccountIdSnapshot: string;
-        systemQuoteAccountIdSnapshot: string;
         userDebitLedgerEntryId: string | null;
         userCreditLedgerEntryId: string | null;
     }>;

package/dist/trade-market/permissions.d.ts

@@ -1,5 +1,5 @@
 export declare const tradeMarketPermissions: {
-    readonly "trade_market:market": readonly ["create", "read", "update", "delete", "list"];
-    readonly "trade_market:order": readonly ["create", "read", "list"];
+    readonly 'trade_market:market': readonly ["create", "read", "update", "delete", "list"];
+    readonly 'trade_market:order': readonly ["create", "read", "list"];
 };
 export type TradeMarketPermission = keyof typeof tradeMarketPermissions;

package/dist/trade-market/schema.d.ts

@@ -6,7 +6,7 @@ export declare const tradeMarketOrderSideEnum: import("drizzle-orm/pg-core").PgE
 export declare const tradeMarketOrderStatusEnum: import("drizzle-orm/pg-core").PgEnum<["created", "completed", "failed"]>;
 /**
  * 交易市场定义
- * 无撮合模式下，用户与系统账户直接成交
+ * 无撮合模式下，系统直接与用户侧记账
  */
 export declare const tradeMarket: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "trade_market";
@@ -114,57 +114,6 @@ export declare const tradeMarket: import("drizzle-orm/pg-core").PgTableWithColum
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        pricingSource: import("drizzle-orm/pg-core").PgColumn<{
-            name: "pricing_source";
-            tableName: "trade_market";
-            dataType: "string";
-            columnType: "PgText";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: true;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: [string, ...string[]];
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        systemBaseAccountId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "system_base_account_id";
-            tableName: "trade_market";
-            dataType: "string";
-            columnType: "PgUUID";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        systemQuoteAccountId: import("drizzle-orm/pg-core").PgColumn<{
-            name: "system_quote_account_id";
-            tableName: "trade_market";
-            dataType: "string";
-            columnType: "PgUUID";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
         isBuyEnabled: import("drizzle-orm/pg-core").PgColumn<{
             name: "is_buy_enabled";
             tableName: "trade_market";
@@ -306,7 +255,7 @@ export declare const tradeMarket: import("drizzle-orm/pg-core").PgTableWithColum
 }>;
 /**
  * 市价订单
- * 无对手单，系统账户与用户账户直接成交
+ * 无对手单，系统直接与用户侧记账
  */
 export declare const tradeMarketOrder: import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "trade_market_order";
@@ -584,40 +533,6 @@ export declare const tradeMarketOrder: import("drizzle-orm/pg-core").PgTableWith
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
-        systemBaseAccountIdSnapshot: import("drizzle-orm/pg-core").PgColumn<{
-            name: "system_base_account_id_snapshot";
-            tableName: "trade_market_order";
-            dataType: "string";
-            columnType: "PgUUID";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
-        systemQuoteAccountIdSnapshot: import("drizzle-orm/pg-core").PgColumn<{
-            name: "system_quote_account_id_snapshot";
-            tableName: "trade_market_order";
-            dataType: "string";
-            columnType: "PgUUID";
-            data: string;
-            driverParam: string;
-            notNull: true;
-            hasDefault: false;
-            isPrimaryKey: false;
-            isAutoincrement: false;
-            hasRuntimeDefault: false;
-            enumValues: undefined;
-            baseColumn: never;
-            identity: undefined;
-            generated: undefined;
-        }, {}, {}>;
         userDebitLedgerEntryId: import("drizzle-orm/pg-core").PgColumn<{
             name: "user_debit_ledger_entry_id";
             tableName: "trade_market_order";
@@ -692,8 +607,6 @@ export declare const tradeMarketOrder: import("drizzle-orm/pg-core").PgTableWith
 export declare const tradeMarketRelations: import("drizzle-orm").Relations<"trade_market", {
     baseAsset: import("drizzle-orm").One<"asset", true>;
     quoteAsset: import("drizzle-orm").One<"asset", true>;
-    systemBaseAccount: import("drizzle-orm").One<"ledger_account", true>;
-    systemQuoteAccount: import("drizzle-orm").One<"ledger_account", true>;
     orders: import("drizzle-orm").Many<"trade_market_order">;
 }>;
 export declare const tradeMarketOrderRelations: import("drizzle-orm").Relations<"trade_market_order", {
@@ -701,8 +614,6 @@ export declare const tradeMarketOrderRelations: import("drizzle-orm").Relations<
     user: import("drizzle-orm").One<"user", true>;
     userBaseAccount: import("drizzle-orm").One<"ledger_account", true>;
     userQuoteAccount: import("drizzle-orm").One<"ledger_account", true>;
-    systemBaseAccountSnapshot: import("drizzle-orm").One<"ledger_account", true>;
-    systemQuoteAccountSnapshot: import("drizzle-orm").One<"ledger_account", true>;
     userDebitLedgerEntry: import("drizzle-orm").One<"ledger_entry", false>;
     userCreditLedgerEntry: import("drizzle-orm").One<"ledger_entry", false>;
 }>;

package/dist/trade-market/seed.d.ts

@@ -0,0 +1 @@
+export declare function seedTradeMarkets(): Promise<void>;