@riocrypto/common-server 1.0.2781 → 1.0.2782

package/build/clients/cluster-client.d.ts

@@ -1,4 +1,4 @@
-import { Quote, Fiat, Crypto, BitsoBankAccount, Side, Country, Order, CryptoAddress, BankAccount, AuthRole, Auth, ImportOrderData, TreasuryProvider, FXProvider, EmarketsFXTrade, ExternalTradingAlgorithm, ExternalTrade, ExternalTradeType, ExternalTradingProvider, ExternalTradingAlgorithmType, STPMXNWithdrawal, AuthPermission, DeferredPaymentType, TwoWaySettlementType, OrderType, EmarketsSettlementType, EmarketsOrderType, BulkBankPayout, BulkCryptoPayout, BulkBankPayment, BulkCryptoPayment, OrderStatus, TWAPSession, TransnetworkFXTrade, TransnetworkSettlementType, TransnetworkOrderType, AuthMethod, StonexFXTrade } from "@riocrypto/common";
+import { Quote, Fiat, Crypto, BitsoBankAccount, Side, Country, Order, CryptoAddress, BankAccount, AuthRole, Auth, ImportOrderData, TreasuryProvider, FXProvider, EmarketsFXTrade, ExternalTradingAlgorithm, ExternalTrade, ExternalTradeType, ExternalTradingProvider, ExternalTradingAlgorithmType, STPMXNWithdrawal, AuthPermission, DeferredPaymentType, TwoWaySettlementType, OrderType, EmarketsSettlementType, EmarketsOrderType, BulkBankPayout, BulkCryptoPayout, BulkBankPayment, BulkCryptoPayment, OrderStatus, TWAPSession, TransnetworkFXTrade, TransnetworkSettlementType, TransnetworkOrderType, AuthMethod, StonexFXTrade, CancelExternalTradeReason } from "@riocrypto/common";
 import { STPMXNWithdrawalDoc } from "../models/STP-mxn-withdrawal";
 declare class ClusterClient {
     private baseUrl;
@@ -125,26 +125,28 @@ declare class ClusterClient {
         receiverCLABE: string;
         amount: number;
     }): Promise<string>;
-    placeEmarketsTrade({ amountToTrade, limitPrice, settlementType, orderType, side, isExternalTrade, }: {
+    placeEmarketsTrade({ externalTradeId, amountToTrade, limitPrice, settlementType, orderType, side, }: {
+        externalTradeId: string;
         amountToTrade: number;
         limitPrice: number;
         settlementType: EmarketsSettlementType;
         orderType: EmarketsOrderType;
         side: Side;
-        isExternalTrade: boolean;
     }): Promise<EmarketsFXTrade>;
-    placeTransnetworkTrade({ amountToTrade, limitPrice, settlementType, orderType, side, isExternalTrade, }: {
+    placeTransnetworkTrade({ externalTradeId, amountToTrade, limitPrice, settlementType, orderType, side, }: {
+        externalTradeId: string;
         amountToTrade: number;
         limitPrice: number;
         settlementType: TransnetworkSettlementType;
         orderType: TransnetworkOrderType;
         side: Side;
-        isExternalTrade: boolean;
     }): Promise<TransnetworkFXTrade>;
     retryEmarketsTrade(id: string): Promise<void>;
     cancelEmarketsTrade(id: string): Promise<void>;
+    cancelTransnetworkTrade(id: string): Promise<void>;
     retryExternalTrade(id: string): Promise<void>;
-    cancelExternalTrade(id: string): Promise<void>;
+    takeExternalTradeQuote(id: string, side: Side): Promise<void>;
+    cancelExternalTrade(id: string, reason?: CancelExternalTradeReason): Promise<void>;
     importExternalTrade(data: {
         provider: ExternalTradingProvider;
         originCurrency: Crypto | Fiat;
@@ -176,16 +178,19 @@ declare class ClusterClient {
     stopExternalTradingAlgorithm(id: string): Promise<ExternalTradingAlgorithm>;
     getExternalTradingAlgorithm(id: string): Promise<ExternalTradingAlgorithm>;
     getExternalTrade(id: string): Promise<ExternalTrade>;
-    placeExternalTrade({ provider, type, originCurrency, destinationCurrency, requestedOriginAmount, requestedDestinationAmount, limitPrice, settlementType, arbitrageSessionId, }: {
+    placeExternalTrade({ provider, type, originCurrency, destinationCurrency, requestedOriginAmount, requestedDestinationAmount, limitPrice, twoWaySettlementDateOffset, arbitrageSessionId, fxTradeId, timeInForce, valueDate, }: {
         provider: ExternalTradingProvider;
         type: ExternalTradeType;
         originCurrency: Crypto | Fiat;
         destinationCurrency: Crypto | Fiat;
         requestedOriginAmount?: number;
         requestedDestinationAmount?: number;
-        limitPrice: number;
-        settlementType?: EmarketsSettlementType | TransnetworkSettlementType;
+        limitPrice?: number;
+        twoWaySettlementDateOffset: number;
         arbitrageSessionId?: string;
+        fxTradeId?: string;
+        timeInForce?: "day" | "gtc" | "ioc" | "fok";
+        valueDate?: string;
     }): Promise<ExternalTrade>;
     generateSTPDepositCLABE(userId: string): Promise<{
         CLABE: string;

package/build/clients/cluster-client.js

@@ -482,14 +482,14 @@ class ClusterClient {
             return (_a = response.data) === null || _a === void 0 ? void 0 : _a.url;
         });
     }
-    placeEmarketsTrade({ amountToTrade, limitPrice, settlementType, orderType, side, isExternalTrade, }) {
+    placeEmarketsTrade({ externalTradeId, amountToTrade, limitPrice, settlementType, orderType, side, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.axios.post(`${this.baseUrl}/api/emarkets/bot/trades`, {
+                externalTradeId,
                 amountToTrade,
                 limitPrice,
                 orderType,
                 side,
-                isExternalTrade,
                 settlementType,
             }, {
                 headers: {
@@ -499,14 +499,14 @@ class ClusterClient {
             return response.data;
         });
     }
-    placeTransnetworkTrade({ amountToTrade, limitPrice, settlementType, orderType, side, isExternalTrade, }) {
+    placeTransnetworkTrade({ externalTradeId, amountToTrade, limitPrice, settlementType, orderType, side, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.axios.post(`${this.baseUrl}/api/transnetwork/bot/trades`, {
+                externalTradeId,
                 amountToTrade,
                 limitPrice,
                 orderType,
                 side,
-                isExternalTrade,
                 settlementType,
             }, {
                 headers: {
@@ -534,14 +534,28 @@ class ClusterClient {
             });
         });
     }
+    cancelTransnetworkTrade(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.axios.post(`${this.baseUrl}/api/transnetwork/bot/trades/${id}/cancel`, {}, {
+                headers: {
+                    "x-cluster-api-key": this.clusterApiKey,
+                },
+            });
+        });
+    }
     retryExternalTrade(id) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.axios.post(`${this.baseUrl}/api/trading/external/trades/${id}/retry`, {}, { headers: { "x-cluster-api-key": this.clusterApiKey } });
         });
     }
-    cancelExternalTrade(id) {
+    takeExternalTradeQuote(id, side) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.axios.post(`${this.baseUrl}/api/trading/external/trades/${id}/take-quote`, { side }, { headers: { "x-cluster-api-key": this.clusterApiKey } });
+        });
+    }
+    cancelExternalTrade(id, reason) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.axios.post(`${this.baseUrl}/api/trading/external/trades/${id}/cancel`, {}, { headers: { "x-cluster-api-key": this.clusterApiKey } });
+            yield this.axios.post(`${this.baseUrl}/api/trading/external/trades/${id}/cancel`, reason ? { reason } : {}, { headers: { "x-cluster-api-key": this.clusterApiKey } });
         });
     }
     importExternalTrade(data) {
@@ -640,7 +654,7 @@ class ClusterClient {
             return response.data;
         });
     }
-    placeExternalTrade({ provider, type, originCurrency, destinationCurrency, requestedOriginAmount, requestedDestinationAmount, limitPrice, settlementType, arbitrageSessionId, }) {
+    placeExternalTrade({ provider, type, originCurrency, destinationCurrency, requestedOriginAmount, requestedDestinationAmount, limitPrice, twoWaySettlementDateOffset, arbitrageSessionId, fxTradeId, timeInForce, valueDate, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.axios.post(`${this.baseUrl}/api/trading/external/trades`, {
                 provider,
@@ -650,8 +664,11 @@ class ClusterClient {
                 requestedOriginAmount,
                 requestedDestinationAmount,
                 limitPrice,
-                settlementType,
+                twoWaySettlementDateOffset,
                 arbitrageSessionId,
+                fxTradeId,
+                timeInForce,
+                valueDate,
             }, {
                 headers: {
                     "x-cluster-api-key": this.clusterApiKey,

package/build/models/emarkets-fx-trade.d.ts

@@ -3,8 +3,7 @@ import { Mongoose, Model, Document, HydratedDocument } from "mongoose";
 interface EmarketsFXTradeAttrs {
     createdAt: Date;
     status: EmarketsFXTradeStatus;
-    FXTradeId?: string;
-    isExternalTrade: boolean;
+    externalTradeId: string;
     side: Side;
     fiat: Fiat;
     amountToTrade: number;
@@ -20,8 +19,7 @@ interface EmarketsFXTradeDoc extends Document {
     createdAt: Date;
     side: Side;
     status: EmarketsFXTradeStatus;
-    FXTradeId?: string;
-    isExternalTrade: boolean;
+    externalTradeId: string;
     fiat: Fiat;
     amountToTrade: number;
     amountReceived?: number;

package/build/models/emarkets-fx-trade.js

@@ -19,12 +19,9 @@ const buildEmarketsFXTrade = (mongoose) => {
             type: String,
             required: true,
         },
-        FXTradeId: {
+        externalTradeId: {
             type: String,
         },
-        isExternalTrade: {
-            type: Boolean,
-        },
         fiat: {
             type: String,
             required: true,

package/build/models/external-trade.d.ts

@@ -18,6 +18,7 @@ interface ExternalTradeAttrs {
     actualPrice?: number;
     associatedMidmarketPrice?: number;
     status: ExternalTradeStatus;
+    fxTradeId?: string;
     providerOptions?: {
         emarkets?: {
             settlementType?: EmarketsSettlementType;
@@ -58,6 +59,7 @@ interface ExternalTradeDoc extends Document {
     actualPrice?: number;
     associatedMidmarketPrice?: number;
     status: ExternalTradeStatus;
+    fxTradeId?: string;
     providerOptions?: {
         emarkets?: {
             settlementType?: EmarketsSettlementType;

package/build/models/external-trade.js

@@ -29,6 +29,9 @@ const buildExternalTrade = (mongoose) => {
             type: String,
             required: true,
         },
+        fxTradeId: {
+            type: String,
+        },
         provider: {
             type: String,
             required: true,

package/build/models/fx-trade.d.ts

@@ -1,4 +1,4 @@
-import { Fiat, FXProvider, FXTradeStatus, Side, Crypto, EmarketsSettlementType, TransnetworkSettlementType } from "@riocrypto/common";
+import { Fiat, FXProvider, FXTradeStatus, Side, Crypto, ExternalTradeStatus } from "@riocrypto/common";
 import { Mongoose, Model, Document, HydratedDocument } from "mongoose";
 interface FXTradeAttrs {
     createdAt: Date;
@@ -6,17 +6,19 @@ interface FXTradeAttrs {
     orderIds: string[];
     amount: number;
     fiat: Fiat;
-    settlementType?: EmarketsSettlementType | TransnetworkSettlementType;
     averageOfferedPrice: number;
     amountTraded: number;
     price?: number;
     provider: FXProvider;
+    twoWaySettlementDate: Date;
+    twoWaySettlementDateOffset: number;
     executedTrades: {
         amount: number;
         provider: FXProvider;
-        price: number;
+        price?: number;
+        status: ExternalTradeStatus;
         matchedTradeId?: string;
-        providerOrderId?: string;
+        externalTradeId?: string;
     }[];
     isRunning?: boolean;
     status: FXTradeStatus;
@@ -29,16 +31,18 @@ interface FXTradeDoc extends Document {
     amount: number;
     fiat: Fiat;
     amountTraded: number;
-    settlementType?: EmarketsSettlementType | TransnetworkSettlementType;
     averageOfferedPrice: number;
     price?: number;
     provider: FXProvider;
+    twoWaySettlementDate: Date;
+    twoWaySettlementDateOffset: number;
     executedTrades: {
         amount: number;
         provider: FXProvider;
-        price: number;
+        price?: number;
+        status: ExternalTradeStatus;
         matchedTradeId?: string;
-        providerOrderId?: string;
+        externalTradeId?: string;
     }[];
     status: FXTradeStatus;
     isRunning?: boolean;

package/build/models/fx-trade.js

@@ -27,8 +27,11 @@ const buildFXTrade = (mongoose) => {
             type: String,
             required: true,
         },
-        settlementType: {
-            type: String,
+        twoWaySettlementDate: {
+            type: mongoose.Schema.Types.Date,
+        },
+        twoWaySettlementDateOffset: {
+            type: Number,
         },
         amountTraded: {
             type: Number,

package/build/models/transnetwork-fx-trade.d.ts

@@ -3,8 +3,7 @@ import { Mongoose, Model, Document, HydratedDocument } from "mongoose";
 interface TransnetworkFXTradeAttrs {
     createdAt: Date;
     status: TransnetworkFXTradeStatus;
-    FXTradeId?: string;
-    isExternalTrade: boolean;
+    externalTradeId?: string;
     side: Side;
     fiat: Fiat;
     amountToTrade: number;
@@ -21,8 +20,7 @@ interface TransnetworkFXTradeDoc extends Document {
     createdAt: Date;
     side: Side;
     status: TransnetworkFXTradeStatus;
-    FXTradeId?: string;
-    isExternalTrade: boolean;
+    externalTradeId?: string;
     fiat: Fiat;
     amountToTrade: number;
     amountReceived?: number;

package/build/models/transnetwork-fx-trade.js

@@ -19,12 +19,9 @@ const buildTransnetworkFXTrade = (mongoose) => {
             type: String,
             required: true,
         },
-        FXTradeId: {
+        externalTradeId: {
             type: String,
         },
-        isExternalTrade: {
-            type: Boolean,
-        },
         fiat: {
             type: String,
             required: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.2781",
+  "version": "1.0.2782",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,7 +24,7 @@
     "@google-cloud/secret-manager": "^5.6.0",
     "@google-cloud/storage": "^7.19.0",
     "@hyperdx/node-opentelemetry": "^0.10.3",
-    "@riocrypto/common": "1.0.2583",
+    "@riocrypto/common": "1.0.2584",
     "@slack/web-api": "^7.15.0",
     "@types/express": "^4.17.25",
     "axios": "1.13.6",