update to haveno-ts 0.0.20

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>haveno-ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

README.md

@@ -5,7 +5,7 @@
 ### Prerequisites
 
 1. Node 16.x
-2. yarn 1.x
+2. yarn 1.x (npm install --global yarn)
 3. Run user1-daemon-local and envoy proxy by following [these instructions](https://github.com/haveno-dex/haveno-ts#run-tests)
 
 ### Install dependencies

package.json

@@ -95,7 +95,7 @@
     "dayjs": "^1.11.0",
     "electron-store": "^8.0.1",
     "electron-updater": "4.6.5",
-    "haveno-ts": "0.0.10",
+    "haveno-ts": "0.0.20",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",

packages/renderer/src/constants/query-keys.ts

@@ -21,7 +21,7 @@ export enum QueryKeys {
   MoneroConnection = "Haveno.MoneroConnection",
   MoneroConnections = "Haveno.MoneroConnections",
   MoneroNodeIsRunning = "Haveno.MoneroNodeIsRunning",
-  MoneroNodeSettings = "Haveno.MoneroNodeSettings",
+  MoneroNodeSettings = "Haveno.XmrNodeSettings",
   PaymentAccounts = "Haveno.PaymentAccounts",
   Prices = "Haveno.Prices",
   PrimaryAddress = "Haveno.PrimaryAddress",

packages/renderer/src/hooks/haveno/useMarketsOffers.ts

@@ -45,12 +45,8 @@ const transformData = (offers: Array<OfferInfo>) => {
       ...offer,
       amount: HavenoUtils.atomicUnitsToXmr(offer.amount),
       minAmount: HavenoUtils.atomicUnitsToXmr(offer.minAmount),
-      buyerSecurityDeposit: HavenoUtils.atomicUnitsToXmr(
+      buyerSecurityDeposit: offer.buyerSecurityDepositPct,
-        offer.buyerSecurityDeposit
+      sellerSecurityDeposit: offer.sellerSecurityDepositPct,
-      ),
-      sellerSecurityDeposit: HavenoUtils.atomicUnitsToXmr(
-        offer.sellerSecurityDeposit
-      ),
       makerFee: HavenoUtils.atomicUnitsToXmr(offer.makerFee),
       price: parseFloat(offer.price),
       volume: parseFloat(offer.volume),

packages/renderer/src/hooks/haveno/useMoneroNodeSettings.ts

@@ -15,13 +15,13 @@
 // =============================================================================
 
 import { useQuery } from "react-query";
-import type { MoneroNodeSettings } from "haveno-ts";
+import type { XmrNodeSettings } from "haveno-ts";
 import { useHavenoClient } from "./useHavenoClient";
 import { QueryKeys } from "@constants/query-keys";
 
 export function useMoneroNodeSettings() {
   const client = useHavenoClient();
-  return useQuery<MoneroNodeSettings | undefined, Error>(
+  return useQuery<XmrNodeSettings | undefined, Error>(
     QueryKeys.MoneroNodeSettings,
     async () => client.getMoneroNodeSettings()
   );

packages/renderer/src/hooks/haveno/useMyOffers.ts

@@ -15,13 +15,13 @@
 // =============================================================================
 
 import { useQuery } from "react-query";
-import type { OfferInfo } from "haveno-ts";
+import type { OfferDirection, OfferInfo } from "haveno-ts";
 import { useHavenoClient } from "./useHavenoClient";
 import { QueryKeys } from "@constants/query-keys";
 
 interface MyOfferesQuery {
   assetCode: string;
-  direction?: "buy" | "sell";
+  direction?: OfferDirection;
 }
 
 export function useMarketsOffers(query: MyOfferesQuery) {

packages/renderer/src/hooks/haveno/useRestoreBackup.ts

@@ -17,7 +17,7 @@
 import { hideNotification, showNotification } from "@mantine/notifications";
 import { useMutation } from "react-query";
 import { useNavigate } from "react-router-dom";
-import { MoneroNodeSettings } from "haveno-ts";
+import { XmrNodeSettings } from "haveno-ts";
 import { useHavenoClient } from "./useHavenoClient";
 import { Notifications } from "@constants/notifications";
 import { deleteSession } from "@utils/session";
@@ -58,7 +58,7 @@ export function useRestoreBackup() {
         await client.stopMoneroNode();
       }
       try {
-        await client.startMoneroNode(new MoneroNodeSettings());
+        await client.startMoneroNode(new XmrNodeSettings());
       } catch (ex) {
         console.log(ex);
         throw new Error("Failed to start the monero node");

packages/renderer/src/hooks/haveno/useSaveLocalMoneroNode.ts

@@ -15,7 +15,7 @@
 // =============================================================================
 
 import { useMutation, useQueryClient } from "react-query";
-import { MoneroNodeSettings } from "haveno-ts";
+import { XmrNodeSettings } from "haveno-ts";
 import { useHavenoClient } from "./useHavenoClient";
 import { QueryKeys } from "@constants/query-keys";
 import { useSaveRemoteNode } from "@hooks/storage/useSaveRemoteNode";
@@ -33,7 +33,7 @@ export function useSaveLocalMoneroNode() {
 
   return useMutation<void, Error, Variables>(
     async (data: Variables) => {
-      const nodeSettings = new MoneroNodeSettings();
+      const nodeSettings = new XmrNodeSettings();
       nodeSettings.setBlockchainPath(data.blockchainPath);
       nodeSettings.setStartupFlagsList(data.startupFlags);
       nodeSettings.setBootstrapUrl(data.bootstrapUrl);

packages/renderer/src/hooks/haveno/useSetOffer.ts

@@ -15,12 +15,13 @@
 // =============================================================================
 
 import { useMutation, useQueryClient } from "react-query";
+import type { OfferDirection } from "haveno-ts";
 import { showNotification } from "@mantine/notifications";
 import { useHavenoClient } from "./useHavenoClient";
 import { QueryKeys } from "@constants/query-keys";
 
 interface SetOfferVariables {
-  direction: string;
+  direction: OfferDirection;
   amount: bigint;
   assetCode: string;
   paymentAccountId: string;

packages/renderer/src/hooks/haveno/useStartMoneroNode.ts

@@ -15,7 +15,7 @@
 // =============================================================================
 
 import { useMutation, useQueryClient } from "react-query";
-import type { MoneroNodeSettings } from "haveno-ts";
+import type { XmrNodeSettings } from "haveno-ts";
 import { useHavenoClient } from "./useHavenoClient";
 import { QueryKeys } from "@constants/query-keys";
 
@@ -23,8 +23,8 @@ export function useStartMoneroNode() {
   const queryClient = useQueryClient();
   const client = useHavenoClient();
 
-  return useMutation<void, Error, MoneroNodeSettings>(
+  return useMutation<void, Error, XmrNodeSettings>(
-    async (data: MoneroNodeSettings) => client.startMoneroNode(data),
+    async (data: XmrNodeSettings) => client.startMoneroNode(data),
     {
       onSuccess: () => {
         queryClient.invalidateQueries(QueryKeys.MoneroNodeIsRunning);

packages/renderer/src/pages/Account/Settings/_utils.ts

@@ -14,16 +14,16 @@
 //  limitations under the License.
 // =============================================================================
 
-import type { MoneroNodeSettings } from "haveno-ts";
+import type { XmrNodeSettings } from "haveno-ts";
 import type { LocalSettingsFormValues } from "./_types";
 
 /**
  * Transformes the settings request values to form.
- * @param    {MoneroNodeSettings.AsObject} nodeSettings
+ * @param    {XmrNodeSettings.AsObject} nodeSettings
  * @returns  {LocalSettingsFormValues}
  */
 export function transformSettingsRequestToForm(
-  nodeSettings: MoneroNodeSettings.AsObject
+  nodeSettings: XmrNodeSettings.AsObject
 ): LocalSettingsFormValues {
   return {
     blockchainLocation: nodeSettings?.blockchainPath || "",