Git-Mirrors/haveno-ts
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno-ts.git synced 2025-02-25 08:51:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

use OfferDirection enum instead of string

Browse Source
This commit is contained in:
woodser 2023-11-09 17:17:14 -05:00
parent 5244abfaf4
commit 56d7219fbc
4 changed files with 79 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/HavenoClient.test.ts
View File

@ -1,12 +1,29 @@
// --------------------------------- IMPORTS ---------------------------------- // --------------------------------- IMPORTS ----------------------------------
// haveno imports // haveno imports
import HavenoClient from "./HavenoClient"; import {
import HavenoError from "./utils/HavenoError"; HavenoClient,
import HavenoUtils from "./utils/HavenoUtils"; HavenoError,
import { MarketPriceInfo, NotificationMessage, OfferInfo, TradeInfo, UrlConnection, XmrBalanceInfo } from "./protobuf/grpc_pb"; // TODO (woodser): better names; haveno_grpc_pb, haveno_pb HavenoUtils,
import { Attachment, DisputeResult, PaymentMethod, PaymentAccountForm, PaymentAccountFormField, PaymentAccount, MoneroNodeSettings} from "./protobuf/pb_pb"; OfferDirection,
import { XmrDestination, XmrTx, XmrIncomingTransfer, XmrOutgoingTransfer } from "./protobuf/grpc_pb"; MarketPriceInfo,
NotificationMessage,
OfferInfo,
TradeInfo,
UrlConnection,
XmrBalanceInfo,
Attachment,
DisputeResult,
PaymentMethod,
PaymentAccountForm,
PaymentAccountFormField,
PaymentAccount,
MoneroNodeSettings,
XmrDestination,
XmrTx,
XmrIncomingTransfer,
XmrOutgoingTransfer,
} from "./index";
import AuthenticationStatus = UrlConnection.AuthenticationStatus; import AuthenticationStatus = UrlConnection.AuthenticationStatus;
import OnlineStatus = UrlConnection.OnlineStatus; import OnlineStatus = UrlConnection.OnlineStatus;
@ -37,6 +54,22 @@ let fundingWallet: moneroTs.MoneroWalletRpc;
let user1Wallet: moneroTs.MoneroWalletRpc; let user1Wallet: moneroTs.MoneroWalletRpc;
let user2Wallet: moneroTs.MoneroWalletRpc; let user2Wallet: moneroTs.MoneroWalletRpc;
enum TradeRole {
MAKER = "MAKER",
TAKER = "TAKER",
}
enum SaleRole {
BUYER = "BUYER",
SELLER = "SELLER"
}
enum DisputeContext {
NONE = "NONE",
OPEN_AFTER_DEPOSITS_UNLOCK = "OPEN_AFTER_DEPOSITS_UNLOCK",
OPEN_AFTER_PAYMENT_SENT = "OPEN_AFTER_PAYMENT_SENT"
}
/** /**
* Test context for a single peer in a trade. * Test context for a single peer in a trade.
*/ */
@ -73,7 +106,7 @@ const defaultTradeConfig: Partial<TradeContext> = {
makeOffer: true, makeOffer: true,
takeOffer: true, takeOffer: true,
awaitFundsToMakeOffer: true, awaitFundsToMakeOffer: true,
direction: "BUY", // buy or sell xmr direction: OfferDirection.BUY, // buy or sell xmr
offerAmount: BigInt("200000000000"), // amount of xmr to trade (0.2 XMR) offerAmount: BigInt("200000000000"), // amount of xmr to trade (0.2 XMR)
offerMinAmount: undefined, offerMinAmount: undefined,
assetCode: "usd", // counter asset to trade assetCode: "usd", // counter asset to trade
@ -125,7 +158,7 @@ class TradeContext {
// make offer // make offer
awaitFundsToMakeOffer?: boolean awaitFundsToMakeOffer?: boolean
direction?: string; direction?: OfferDirection;
assetCode?: string; assetCode?: string;
offerAmount?: bigint; // offer amount or max offerAmount?: bigint; // offer amount or max
offerMinAmount?: bigint; offerMinAmount?: bigint;
@ -195,15 +228,15 @@ class TradeContext {
} }
getBuyer(): PeerContext { getBuyer(): PeerContext {
return (this.direction?.toUpperCase() === "BUY" ? this.maker : this.taker) as PeerContext; return (this.direction === OfferDirection.BUY ? this.maker : this.taker) as PeerContext;
} }
getSeller(): PeerContext { getSeller(): PeerContext {
return (this.direction?.toUpperCase() === "BUY" ? this.taker : this.maker) as PeerContext; return (this.direction === OfferDirection.BUY ? this.taker : this.maker) as PeerContext;
} }
isBuyerMaker(): boolean { isBuyerMaker(): boolean {
return this.direction?.toUpperCase() === "BUY"; return this.direction === OfferDirection.BUY;
} }
getDisputeOpener(): PeerContext | undefined { getDisputeOpener(): PeerContext | undefined {
@ -236,7 +269,7 @@ class TradeContext {
async toSummary(): Promise<string> { async toSummary(): Promise<string> {
let str: string = ""; let str: string = "";
str += "Type: Maker/" + (this.direction!.toUpperCase() === "BUY" ? "Buyer" : "Seller") + ", Taker/" + (this.direction!.toUpperCase() === "BUY" ? "Seller" : "Buyer"); str += "Type: Maker/" + (this.direction === OfferDirection.BUY ? "Buyer" : "Seller") + ", Taker/" + (this.direction === OfferDirection.BUY ? "Seller" : "Buyer");
str += "\nOffer id: " + this.offerId; str += "\nOffer id: " + this.offerId;
if (this.maker.havenod) str += "\nMaker uri: " + this.maker?.havenod?.getUrl(); if (this.maker.havenod) str += "\nMaker uri: " + this.maker?.havenod?.getUrl();
if (this.taker.havenod) str += "\nTaker uri: " + this.taker?.havenod?.getUrl(); if (this.taker.havenod) str += "\nTaker uri: " + this.taker?.havenod?.getUrl();
@ -256,7 +289,7 @@ class TradeContext {
let tx = await monerod.getTx(this.arbitrator!.trade!.getMakerDepositTxId()); let tx = await monerod.getTx(this.arbitrator!.trade!.getMakerDepositTxId());
str += "\nMaker deposit tx fee: " + (tx ? tx?.getFee() : undefined); str += "\nMaker deposit tx fee: " + (tx ? tx?.getFee() : undefined);
} }
str += "\nMaker security deposit received: " + (this.direction == "BUY" ? this.arbitrator!.trade!.getBuyerSecurityDeposit() : this.arbitrator!.trade!.getSellerSecurityDeposit()); str += "\nMaker security deposit received: " + (this.direction == OfferDirection.BUY ? this.arbitrator!.trade!.getBuyerSecurityDeposit() : this.arbitrator!.trade!.getSellerSecurityDeposit());
} }
str += "\nTaker balance before offer: " + this.taker.balancesBeforeOffer?.getBalance(); str += "\nTaker balance before offer: " + this.taker.balancesBeforeOffer?.getBalance();
if (this.arbitrator && this.arbitrator!.trade) { if (this.arbitrator && this.arbitrator!.trade) {
@ -266,7 +299,7 @@ class TradeContext {
let tx = await monerod.getTx(this.arbitrator!.trade!.getTakerDepositTxId()); let tx = await monerod.getTx(this.arbitrator!.trade!.getTakerDepositTxId());
str += "\nTaker deposit tx fee: " + (tx ? tx?.getFee() : undefined); str += "\nTaker deposit tx fee: " + (tx ? tx?.getFee() : undefined);
} }
str += "\nTaker security deposit received: " + (this.direction == "BUY" ? this.arbitrator!.trade!.getSellerSecurityDeposit() : this.arbitrator!.trade!.getBuyerSecurityDeposit()); str += "\nTaker security deposit received: " + (this.direction == OfferDirection.BUY ? this.arbitrator!.trade!.getSellerSecurityDeposit() : this.arbitrator!.trade!.getBuyerSecurityDeposit());
if (this.disputeWinner) str += "\nDispute winner: " + (this.disputeWinner == DisputeResult.Winner.BUYER ? "Buyer" : "Seller"); if (this.disputeWinner) str += "\nDispute winner: " + (this.disputeWinner == DisputeResult.Winner.BUYER ? "Buyer" : "Seller");
str += "\nPayout tx id: " + this.payoutTxId; str += "\nPayout tx id: " + this.payoutTxId;
if (this.payoutTxId) { if (this.payoutTxId) {
@ -407,22 +440,6 @@ interface HavenodContext {
walletUrl?: string walletUrl?: string
} }
enum TradeRole {
MAKER = "MAKER",
TAKER = "TAKER",
}
enum SaleRole {
BUYER = "BUYER",
SELLER = "SELLER"
}
enum DisputeContext {
NONE = "NONE",
OPEN_AFTER_DEPOSITS_UNLOCK = "OPEN_AFTER_DEPOSITS_UNLOCK",
OPEN_AFTER_PAYMENT_SENT = "OPEN_AFTER_PAYMENT_SENT"
}
interface TxContext { interface TxContext {
isCreatedTx: boolean; isCreatedTx: boolean;
} }
@ -1065,13 +1082,13 @@ test("Can get market depth (CI, sanity check)", async () => {
expect(marketDepth.getSellDepthList().length).toEqual(0); expect(marketDepth.getSellDepthList().length).toEqual(0);
// post offers to buy and sell // post offers to buy and sell
await makeOffer({maker: {havenod: user1}, direction: "BUY", offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.0}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.BUY, offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.0});
await makeOffer({maker: {havenod: user1}, direction: "BUY", offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.2}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.BUY, offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.2});
await makeOffer({maker: {havenod: user1}, direction: "BUY", offerAmount: BigInt("200000000000"), assetCode: assetCode, price: 17.3}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.BUY, offerAmount: BigInt("200000000000"), assetCode: assetCode, price: 17.3});
await makeOffer({maker: {havenod: user1}, direction: "BUY", offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.3}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.BUY, offerAmount: BigInt("150000000000"), assetCode: assetCode, price: 17.3});
await makeOffer({maker: {havenod: user1}, direction: "SELL", offerAmount: BigInt("300000000000"), assetCode: assetCode, priceMargin: 0.00}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.SELL, offerAmount: BigInt("300000000000"), assetCode: assetCode, priceMargin: 0.00});
await makeOffer({maker: {havenod: user1}, direction: "SELL", offerAmount: BigInt("300000000000"), assetCode: assetCode, priceMargin: 0.02}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.SELL, offerAmount: BigInt("300000000000"), assetCode: assetCode, priceMargin: 0.02});
await makeOffer({maker: {havenod: user1}, direction: "SELL", offerAmount: BigInt("400000000000"), assetCode: assetCode, priceMargin: 0.05}); await makeOffer({maker: {havenod: user1}, direction: OfferDirection.SELL, offerAmount: BigInt("400000000000"), assetCode: assetCode, priceMargin: 0.05});
// get user2's market depth // get user2's market depth
await wait(TestConfig.trade.maxTimePeerNoticeMs); await wait(TestConfig.trade.maxTimePeerNoticeMs);
@ -1084,7 +1101,7 @@ test("Can get market depth (CI, sanity check)", async () => {
expect(marketDepth.getSellPricesList().length).toEqual(marketDepth.getSellDepthList().length); expect(marketDepth.getSellPricesList().length).toEqual(marketDepth.getSellDepthList().length);
// test buy prices and depths // test buy prices and depths
const buyOffers = (await user1.getOffers(assetCode, "BUY")).concat(await user1.getMyOffers(assetCode, "BUY")).sort(function(a, b) { return parseFloat(a.getPrice()) - parseFloat(b.getPrice()) }); const buyOffers = (await user1.getOffers(assetCode, OfferDirection.BUY)).concat(await user1.getMyOffers(assetCode, OfferDirection.BUY)).sort(function(a, b) { return parseFloat(a.getPrice()) - parseFloat(b.getPrice()) });
expect(marketDepth.getBuyPricesList()[0]).toEqual(1 / parseFloat(buyOffers[0].getPrice())); // TODO: price when posting offer is reversed. this assumes crypto counter currency expect(marketDepth.getBuyPricesList()[0]).toEqual(1 / parseFloat(buyOffers[0].getPrice())); // TODO: price when posting offer is reversed. this assumes crypto counter currency
expect(marketDepth.getBuyPricesList()[1]).toEqual(1 / parseFloat(buyOffers[1].getPrice())); expect(marketDepth.getBuyPricesList()[1]).toEqual(1 / parseFloat(buyOffers[1].getPrice()));
expect(marketDepth.getBuyPricesList()[2]).toEqual(1 / parseFloat(buyOffers[2].getPrice())); expect(marketDepth.getBuyPricesList()[2]).toEqual(1 / parseFloat(buyOffers[2].getPrice()));
@ -1093,7 +1110,7 @@ test("Can get market depth (CI, sanity check)", async () => {
expect(marketDepth.getBuyDepthList()[2]).toEqual(0.65); expect(marketDepth.getBuyDepthList()[2]).toEqual(0.65);
// test sell prices and depths // test sell prices and depths
const sellOffers = (await user1.getOffers(assetCode, "SELL")).concat(await user1.getMyOffers(assetCode, "SELL")).sort(function(a, b) { return parseFloat(b.getPrice()) - parseFloat(a.getPrice()) }); const sellOffers = (await user1.getOffers(assetCode, OfferDirection.SELL)).concat(await user1.getMyOffers(assetCode, OfferDirection.SELL)).sort(function(a, b) { return parseFloat(b.getPrice()) - parseFloat(a.getPrice()) });
expect(marketDepth.getSellPricesList()[0]).toEqual(1 / parseFloat(sellOffers[0].getPrice())); expect(marketDepth.getSellPricesList()[0]).toEqual(1 / parseFloat(sellOffers[0].getPrice()));
expect(marketDepth.getSellPricesList()[1]).toEqual(1 / parseFloat(sellOffers[1].getPrice())); expect(marketDepth.getSellPricesList()[1]).toEqual(1 / parseFloat(sellOffers[1].getPrice()));
expect(marketDepth.getSellPricesList()[2]).toEqual(1 / parseFloat(sellOffers[2].getPrice())); expect(marketDepth.getSellPricesList()[2]).toEqual(1 / parseFloat(sellOffers[2].getPrice()));
@ -1345,7 +1362,7 @@ test("Can post and remove an offer (CI, sanity check)", async () => {
await user1.removeOffer(offer.getId()); await user1.removeOffer(offer.getId());
// offer is removed from my offers // offer is removed from my offers
if (getOffer(await user1.getMyOffers(assetCode, "BUY"), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after removal"); if (getOffer(await user1.getMyOffers(assetCode, OfferDirection.BUY), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after removal");
// reserved balance released // reserved balance released
expect(BigInt((await user1.getBalances()).getAvailableBalance())).toEqual(availableBalanceBefore); expect(BigInt((await user1.getBalances()).getAvailableBalance())).toEqual(availableBalanceBefore);
@ -1367,7 +1384,7 @@ test("Can post and remove an offer (CI, sanity check)", async () => {
await user1.removeOffer(offer.getId()); await user1.removeOffer(offer.getId());
// offer is removed from my offers // offer is removed from my offers
if (getOffer(await user1.getMyOffers(assetCode, "BUY"), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after removal"); if (getOffer(await user1.getMyOffers(assetCode, OfferDirection.BUY), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after removal");
// reserved balance released // reserved balance released
expect(BigInt((await user1.getBalances()).getAvailableBalance())).toEqual(availableBalanceBefore); expect(BigInt((await user1.getBalances()).getAvailableBalance())).toEqual(availableBalanceBefore);
@ -1393,7 +1410,7 @@ test("Can schedule offers with locked funds (CI)", async () => {
// schedule offer // schedule offer
const assetCode = "BCH"; const assetCode = "BCH";
const direction = "BUY"; const direction = OfferDirection.BUY;
const ctx = new TradeContext({maker: {havenod: user3}, assetCode: assetCode, direction: direction, awaitFundsToMakeOffer: false}); const ctx = new TradeContext({maker: {havenod: user3}, assetCode: assetCode, direction: direction, awaitFundsToMakeOffer: false});
let offer: OfferInfo = await makeOffer(ctx); let offer: OfferInfo = await makeOffer(ctx);
assert.equal(offer.getState(), "SCHEDULED"); assert.equal(offer.getState(), "SCHEDULED");
@ -1498,7 +1515,7 @@ test("Cannot post offer exceeding trade limit (CI, sanity check)", async () => {
try { try {
await executeTrade({ await executeTrade({
offerAmount: BigInt("2100000000000"), offerAmount: BigInt("2100000000000"),
direction: "BUY", direction: OfferDirection.BUY,
assetCode: assetCode, assetCode: assetCode,
makerPaymentAccountId: account.getId(), makerPaymentAccountId: account.getId(),
takeOffer: false takeOffer: false
@ -1512,7 +1529,7 @@ test("Cannot post offer exceeding trade limit (CI, sanity check)", async () => {
try { try {
await executeTrade({ await executeTrade({
offerAmount: BigInt("2600000000000"), offerAmount: BigInt("2600000000000"),
direction: "SELL", direction: OfferDirection.SELL,
assetCode: assetCode, assetCode: assetCode,
makerPaymentAccountId: account.getId(), makerPaymentAccountId: account.getId(),
takeOffer: false takeOffer: false
@ -1525,7 +1542,7 @@ test("Cannot post offer exceeding trade limit (CI, sanity check)", async () => {
// test that sell limit is higher than buy limit // test that sell limit is higher than buy limit
let offerId = await executeTrade({ let offerId = await executeTrade({
offerAmount: BigInt("2100000000000"), offerAmount: BigInt("2100000000000"),
direction: "SELL", direction: OfferDirection.SELL,
assetCode: assetCode, assetCode: assetCode,
makerPaymentAccountId: account.getId(), makerPaymentAccountId: account.getId(),
takeOffer: false takeOffer: false
@ -1566,7 +1583,7 @@ test("Can complete all trade combinations (stress)", async () => {
// generate trade context for each combination (buyer/seller, maker/taker, dispute(s), dispute winner) // generate trade context for each combination (buyer/seller, maker/taker, dispute(s), dispute winner)
const ctxs: TradeContext[] = []; const ctxs: TradeContext[] = [];
const MAKER_OPTS = [TradeRole.MAKER, TradeRole.TAKER]; const MAKER_OPTS = [TradeRole.MAKER, TradeRole.TAKER];
const DIRECTION_OPTS = ["BUY", "SELL"]; const DIRECTION_OPTS = [OfferDirection.BUY, OfferDirection.SELL];
const BUYER_DISPUTE_OPTS = [DisputeContext.NONE, DisputeContext.OPEN_AFTER_DEPOSITS_UNLOCK, DisputeContext.OPEN_AFTER_PAYMENT_SENT]; const BUYER_DISPUTE_OPTS = [DisputeContext.NONE, DisputeContext.OPEN_AFTER_DEPOSITS_UNLOCK, DisputeContext.OPEN_AFTER_PAYMENT_SENT];
const SELLER_DISPUTE_OPTS = [DisputeContext.NONE, DisputeContext.OPEN_AFTER_DEPOSITS_UNLOCK, DisputeContext.OPEN_AFTER_PAYMENT_SENT]; const SELLER_DISPUTE_OPTS = [DisputeContext.NONE, DisputeContext.OPEN_AFTER_DEPOSITS_UNLOCK, DisputeContext.OPEN_AFTER_PAYMENT_SENT];
const DISPUTE_WINNER_OPTS = [DisputeResult.Winner.BUYER, DisputeResult.Winner.SELLER]; const DISPUTE_WINNER_OPTS = [DisputeResult.Winner.BUYER, DisputeResult.Winner.SELLER];
@ -1858,7 +1875,7 @@ test("Invalidates offers when reserved funds are spent (CI)", async () => {
// offer is available to peers // offer is available to peers
await wait(TestConfig.trade.walletSyncPeriodMs * 2); await wait(TestConfig.trade.walletSyncPeriodMs * 2);
if (!getOffer(await user2.getOffers(assetCode, "BUY"), offer.getId())) throw new Error("Offer " + offer.getId() + " was not found in peer's offers after posting"); if (!getOffer(await user2.getOffers(assetCode, OfferDirection.BUY), offer.getId())) throw new Error("Offer " + offer.getId() + " was not found in peer's offers after posting");
// spend one of offer's reserved outputs // spend one of offer's reserved outputs
if (!reservedKeyImages.length) throw new Error("No reserved key images detected"); if (!reservedKeyImages.length) throw new Error("No reserved key images detected");
@ -1871,10 +1888,10 @@ test("Invalidates offers when reserved funds are spent (CI)", async () => {
// offer is removed from peer offers // offer is removed from peer offers
await wait(20000); await wait(20000);
if (getOffer(await user2.getOffers(assetCode, "BUY"), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in peer's offers after reserved funds spent"); if (getOffer(await user2.getOffers(assetCode, OfferDirection.BUY), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in peer's offers after reserved funds spent");
// offer is removed from my offers // offer is removed from my offers
if (getOffer(await user1.getMyOffers(assetCode, "BUY"), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after reserved funds spent"); if (getOffer(await user1.getMyOffers(assetCode, OfferDirection.BUY), offer.getId())) throw new Error("Offer " + offer.getId() + " was found in my offers after reserved funds spent");
// offer is automatically cancelled // offer is automatically cancelled
try { try {

24
src/HavenoClient.ts
View File

@ -1,11 +1,11 @@
import console from "console"; import console from "console";
import HavenoError from "./utils/HavenoError"; import HavenoError from "./types/HavenoError";
import HavenoUtils from "./utils/HavenoUtils"; import HavenoUtils from "./utils/HavenoUtils";
import TaskLooper from "./utils/TaskLooper"; import TaskLooper from "./utils/TaskLooper";
import type * as grpcWeb from "grpc-web"; import type * as grpcWeb from "grpc-web";
import { GetVersionClient, AccountClient, MoneroConnectionsClient, DisputesClient, DisputeAgentsClient, NotificationsClient, WalletsClient, PriceClient, OffersClient, PaymentAccountsClient, TradesClient, ShutdownServerClient, MoneroNodeClient } from './protobuf/GrpcServiceClientPb'; import { GetVersionClient, AccountClient, MoneroConnectionsClient, DisputesClient, DisputeAgentsClient, NotificationsClient, WalletsClient, PriceClient, OffersClient, PaymentAccountsClient, TradesClient, ShutdownServerClient, MoneroNodeClient } from './protobuf/GrpcServiceClientPb';
import { GetVersionRequest, GetVersionReply, IsAppInitializedRequest, IsAppInitializedReply, RegisterDisputeAgentRequest, UnregisterDisputeAgentRequest, MarketPriceRequest, MarketPriceReply, MarketPricesRequest, MarketPricesReply, MarketPriceInfo, MarketDepthRequest, MarketDepthReply, MarketDepthInfo, GetBalancesRequest, GetBalancesReply, XmrBalanceInfo, GetMyOfferRequest, GetMyOfferReply, GetOffersRequest, GetOffersReply, OfferInfo, GetPaymentMethodsRequest, GetPaymentMethodsReply, GetPaymentAccountFormRequest, CreatePaymentAccountRequest, ValidateFormFieldRequest, CreatePaymentAccountReply, GetPaymentAccountFormReply, GetPaymentAccountsRequest, GetPaymentAccountsReply, CreateCryptoCurrencyPaymentAccountRequest, CreateCryptoCurrencyPaymentAccountReply, PostOfferRequest, PostOfferReply, CancelOfferRequest, TakeOfferRequest, TakeOfferReply, TradeInfo, GetTradeRequest, GetTradeReply, GetTradesRequest, GetTradesReply, GetXmrSeedRequest, GetXmrSeedReply, GetXmrPrimaryAddressRequest, GetXmrPrimaryAddressReply, GetXmrNewSubaddressRequest, GetXmrNewSubaddressReply, ConfirmPaymentSentRequest, ConfirmPaymentReceivedRequest, CompleteTradeRequest, XmrTx, GetXmrTxsRequest, GetXmrTxsReply, XmrDestination, CreateXmrTxRequest, CreateXmrTxReply, RelayXmrTxRequest, RelayXmrTxReply, CreateAccountRequest, AccountExistsRequest, AccountExistsReply, DeleteAccountRequest, OpenAccountRequest, IsAccountOpenRequest, IsAccountOpenReply, CloseAccountRequest, ChangePasswordRequest, BackupAccountRequest, BackupAccountReply, RestoreAccountRequest, StopRequest, NotificationMessage, RegisterNotificationListenerRequest, SendNotificationRequest, UrlConnection, AddConnectionRequest, RemoveConnectionRequest, GetConnectionRequest, GetConnectionsRequest, SetConnectionRequest, CheckConnectionRequest, CheckConnectionsReply, CheckConnectionsRequest, StartCheckingConnectionsRequest, StopCheckingConnectionsRequest, GetBestAvailableConnectionRequest, SetAutoSwitchRequest, CheckConnectionReply, GetConnectionsReply, GetConnectionReply, GetBestAvailableConnectionReply, GetDisputeRequest, GetDisputeReply, GetDisputesRequest, GetDisputesReply, OpenDisputeRequest, ResolveDisputeRequest, SendDisputeChatMessageRequest, SendChatMessageRequest, GetChatMessagesRequest, GetChatMessagesReply, StartMoneroNodeRequest, StopMoneroNodeRequest, IsMoneroNodeOnlineRequest, IsMoneroNodeOnlineReply, GetMoneroNodeSettingsRequest, GetMoneroNodeSettingsReply } from "./protobuf/grpc_pb"; import { GetVersionRequest, GetVersionReply, IsAppInitializedRequest, IsAppInitializedReply, RegisterDisputeAgentRequest, UnregisterDisputeAgentRequest, MarketPriceRequest, MarketPriceReply, MarketPricesRequest, MarketPricesReply, MarketPriceInfo, MarketDepthRequest, MarketDepthReply, MarketDepthInfo, GetBalancesRequest, GetBalancesReply, XmrBalanceInfo, GetMyOfferRequest, GetMyOfferReply, GetOffersRequest, GetOffersReply, OfferInfo, GetPaymentMethodsRequest, GetPaymentMethodsReply, GetPaymentAccountFormRequest, CreatePaymentAccountRequest, ValidateFormFieldRequest, CreatePaymentAccountReply, GetPaymentAccountFormReply, GetPaymentAccountsRequest, GetPaymentAccountsReply, CreateCryptoCurrencyPaymentAccountRequest, CreateCryptoCurrencyPaymentAccountReply, PostOfferRequest, PostOfferReply, CancelOfferRequest, TakeOfferRequest, TakeOfferReply, TradeInfo, GetTradeRequest, GetTradeReply, GetTradesRequest, GetTradesReply, GetXmrSeedRequest, GetXmrSeedReply, GetXmrPrimaryAddressRequest, GetXmrPrimaryAddressReply, GetXmrNewSubaddressRequest, GetXmrNewSubaddressReply, ConfirmPaymentSentRequest, ConfirmPaymentReceivedRequest, CompleteTradeRequest, XmrTx, GetXmrTxsRequest, GetXmrTxsReply, XmrDestination, CreateXmrTxRequest, CreateXmrTxReply, RelayXmrTxRequest, RelayXmrTxReply, CreateAccountRequest, AccountExistsRequest, AccountExistsReply, DeleteAccountRequest, OpenAccountRequest, IsAccountOpenRequest, IsAccountOpenReply, CloseAccountRequest, ChangePasswordRequest, BackupAccountRequest, BackupAccountReply, RestoreAccountRequest, StopRequest, NotificationMessage, RegisterNotificationListenerRequest, SendNotificationRequest, UrlConnection, AddConnectionRequest, RemoveConnectionRequest, GetConnectionRequest, GetConnectionsRequest, SetConnectionRequest, CheckConnectionRequest, CheckConnectionsReply, CheckConnectionsRequest, StartCheckingConnectionsRequest, StopCheckingConnectionsRequest, GetBestAvailableConnectionRequest, SetAutoSwitchRequest, CheckConnectionReply, GetConnectionsReply, GetConnectionReply, GetBestAvailableConnectionReply, GetDisputeRequest, GetDisputeReply, GetDisputesRequest, GetDisputesReply, OpenDisputeRequest, ResolveDisputeRequest, SendDisputeChatMessageRequest, SendChatMessageRequest, GetChatMessagesRequest, GetChatMessagesReply, StartMoneroNodeRequest, StopMoneroNodeRequest, IsMoneroNodeOnlineRequest, IsMoneroNodeOnlineReply, GetMoneroNodeSettingsRequest, GetMoneroNodeSettingsReply } from "./protobuf/grpc_pb";
import { PaymentMethod, PaymentAccountForm, PaymentAccountFormField, PaymentAccount, PaymentAccountPayload, AvailabilityResult, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb"; import { OfferDirection, PaymentMethod, PaymentAccountForm, PaymentAccountFormField, PaymentAccount, PaymentAccountPayload, AvailabilityResult, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
/** /**
* Haveno daemon client. * Haveno daemon client.
@ -944,13 +944,13 @@ export default class HavenoClient {
* Get available offers to buy or sell XMR. * Get available offers to buy or sell XMR.
* *
* @param {string} assetCode - traded asset code * @param {string} assetCode - traded asset code
* @param {string|undefined} direction - "buy" or "sell" (default all) * @param {OfferDirection|undefined} direction - "buy" or "sell" (default all)
* @return {OfferInfo[]} the available offers * @return {OfferInfo[]} the available offers
*/ */
async getOffers(assetCode: string, direction?: string): Promise<OfferInfo[]> { async getOffers(assetCode: string, direction?: OfferDirection): Promise<OfferInfo[]> {
try { try {
if (!direction) return (await this.getOffers(assetCode, "buy")).concat(await this.getOffers(assetCode, "sell")); // TODO: implement in backend if (direction === undefined) return (await this.getOffers(assetCode, OfferDirection.BUY)).concat(await this.getOffers(assetCode, OfferDirection.SELL)); // TODO: implement in backend
return (await this._offersClient.getOffers(new GetOffersRequest().setDirection(direction).setCurrencyCode(assetCode), {password: this._password})).getOffersList(); return (await this._offersClient.getOffers(new GetOffersRequest().setDirection(direction === OfferDirection.BUY ? "buy" : "sell").setCurrencyCode(assetCode), {password: this._password})).getOffersList();
} catch (e: any) { } catch (e: any) {
throw new HavenoError(e.message, e.code); throw new HavenoError(e.message, e.code);
} }
@ -960,14 +960,14 @@ export default class HavenoClient {
* Get the user's posted offers to buy or sell XMR. * Get the user's posted offers to buy or sell XMR.
* *
* @param {string|undefined} assetCode - traded asset code * @param {string|undefined} assetCode - traded asset code
* @param {string|undefined} direction - "buy" or "sell" XMR (default all) * @param {OfferDirection|undefined} direction - get offers to buy or sell XMR (default all)
* @return {OfferInfo[]} the user's created offers * @return {OfferInfo[]} the user's created offers
*/ */
async getMyOffers(assetCode?: string, direction?: string): Promise<OfferInfo[]> { async getMyOffers(assetCode?: string, direction?: OfferDirection): Promise<OfferInfo[]> {
try { try {
const req = new GetOffersRequest(); const req = new GetOffersRequest();
if (assetCode) req.setCurrencyCode(assetCode); if (assetCode) req.setCurrencyCode(assetCode);
if (direction) req.setDirection(direction); if (direction !== undefined) req.setDirection(direction === OfferDirection.BUY ? "buy" : "sell"); // TODO: request should use OfferDirection too?
return (await this._offersClient.getMyOffers(req, {password: this._password})).getOffersList(); return (await this._offersClient.getMyOffers(req, {password: this._password})).getOffersList();
} catch (e: any) { } catch (e: any) {
throw new HavenoError(e.message, e.code); throw new HavenoError(e.message, e.code);
@ -991,7 +991,7 @@ export default class HavenoClient {
/** /**
* Post an offer. * Post an offer.
* *
* @param {string} direction - "buy" or "sell" XMR * @param {OfferDirection} direction - "buy" or "sell" XMR
* @param {bigint} amount - amount of XMR to trade * @param {bigint} amount - amount of XMR to trade
* @param {string} assetCode - asset code to trade for XMR * @param {string} assetCode - asset code to trade for XMR
* @param {string} paymentAccountId - payment account id * @param {string} paymentAccountId - payment account id
@ -1003,7 +1003,7 @@ export default class HavenoClient {
* @param {number} reserveExactAmount - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false) * @param {number} reserveExactAmount - reserve exact amount needed for offer, incurring on-chain transaction and 10 confirmations before the offer goes live (default = false)
* @return {OfferInfo} the posted offer * @return {OfferInfo} the posted offer
*/ */
async postOffer(direction: string, async postOffer(direction: OfferDirection,
amount: bigint, amount: bigint,
assetCode: string, assetCode: string,
paymentAccountId: string, paymentAccountId: string,
@ -1016,7 +1016,7 @@ export default class HavenoClient {
console.log("Posting offer with security deposit %: " + securityDepositPct) console.log("Posting offer with security deposit %: " + securityDepositPct)
try { try {
const request = new PostOfferRequest() const request = new PostOfferRequest()
.setDirection(direction) .setDirection(direction === OfferDirection.BUY ? "buy" : "sell")
.setAmount(amount.toString()) .setAmount(amount.toString())
.setCurrencyCode(assetCode) .setCurrencyCode(assetCode)
.setPaymentAccountId(paymentAccountId) .setPaymentAccountId(paymentAccountId)

2
src/index.ts
View File

@ -1,5 +1,5 @@
import HavenoClient from "./HavenoClient"; import HavenoClient from "./HavenoClient";
import HavenoError from "./utils/HavenoError"; import HavenoError from "./types/HavenoError";
import HavenoUtils from "./utils/HavenoUtils"; import HavenoUtils from "./utils/HavenoUtils";
export { HavenoClient }; export { HavenoClient };

0
src/utils/HavenoError.ts → src/types/HavenoError.ts
View File