button, you'll be shown an offer by the _Swap Provider_. This includes:
+}}/> button, you'll be shown an offer by the _maker_. This includes:
- the exchange rate (how much Bitcoin they demand for 1 Monero)
- the minimum and maximum amounts you can swap
@@ -88,10 +88,10 @@ The swap will go through four stages:
1. **Locking the Bitcoin**:
Your Bitcoin is locked in a 2-of-2 multisig address.
-2. **_Swap Provider_ locks the Monero**:
+2. **_Maker_ locks the Monero**:
The other party locks their Monero as well.
-3. **_Swap Provider_ redeems _Bitcoin_**:
+3. **_Maker_ redeems _Bitcoin_**:
The other party redeems the Bitcoin.
4. **Redeeming the Monero**:
diff --git a/docs/pages/usage/market_maker_discovery.mdx b/docs/pages/usage/market_maker_discovery.mdx
index 4e734ad9e..de78aac43 100644
--- a/docs/pages/usage/market_maker_discovery.mdx
+++ b/docs/pages/usage/market_maker_discovery.mdx
@@ -1,16 +1,16 @@
-# _Swap Provider_ discovery
+# _Maker_ discovery
-A _Swap Provider_ is a service run by a pseudonymous entity that offers to sell Monero in exchange for Bitcoin. To swap your Bitcoin for Monero you need to connect to a one of these _Swap Providers_.
-The different ways to discover _Swap Providers_ are described below.
+A _maker_ is a service run by a pseudonymous entity that offers to sell Monero in exchange for Bitcoin. To swap your Bitcoin for Monero you need to connect to a one of these _makers_.
+The different ways to discover _makers_ are described below.
-There are two ways to discover _Swap Providers_:
+There are two ways to discover _makers_:
-1. **Public Registry**: Community volunteers maintain a list of _Swap Providers_ that is provided to the GUI and is kept up to date automatically. This list is displayed in the GUI by default. The _Public Registry_ also stores additional information about the _Swap Providers_ such as their uptime and age, and makes it available to the GUI.
-2. **Rendezvous**: The GUI can discover Swap Providers using the [_Rendezvous_ protocol](https://docs.libp2p.io/concepts/discovery-routing/rendezvous/). This protocol enables the GUI to find providers that register themselves at a _Rendezvous Point_. The GUI can query these points to get a list of registered providers. _Rendezvous Points_ are operated by community volunteers, and anyone can run one. The GUI can connect to various _Rendezvous Points_ to discover different _Swap Providers_.
+1. **Public Registry**: Community volunteers maintain a list of _makers_ that is provided to the GUI and is kept up to date automatically. This list is displayed in the GUI by default. The _Public Registry_ also stores additional information about the _makers_ such as their uptime and age, and makes it available to the GUI.
+2. **Rendezvous**: The GUI can discover makers using the [_Rendezvous_ protocol](https://docs.libp2p.io/concepts/discovery-routing/rendezvous/). This protocol enables the GUI to find makers that register themselves at a _Rendezvous Point_. The GUI can query these points to get a list of registered makers. _Rendezvous Points_ are operated by community volunteers, and anyone can run one. The GUI can connect to various _Rendezvous Points_ to discover different _makers_.
## _Public Registry_
-The providers from the registry are displayed in the GUI. If you want to connect to them directly without the GUI choose one from the table below.
+The makers from the registry are displayed in the GUI. If you want to connect to them directly without the GUI choose one from the table below.
import SwapProviderTable from "../../components/SwapProviderTable";
@@ -19,9 +19,9 @@ import SwapProviderTable from "../../components/SwapProviderTable";
@@ -30,14 +30,14 @@ import SwapProviderTable from "../../components/SwapProviderTable";
display: "inline-block",
// center vertically
verticalAlign: "middle",
- }}/> button to open the _Discover swap providers_ dialog. Enter the _Multiaddress_ of the _Rendezvous Point_ you want to connect to. You can also choose one of the predined ones from the list below the Textfield. Click the _Connect_ button to connect to the rendezvous point.
+ }}/> button to open the _Discover makers_ dialog. Enter the _Multiaddress_ of the _Rendezvous Point_ you want to connect to. You can also choose one of the predined ones from the list below the Textfield. Click the _Connect_ button to connect to the rendezvous point.
-## How to add a _Swap Provider_ to the _Public Registry_
+## How to add a _maker_ to the _Public Registry_
-If you know of a _Swap Provider_ that is not yet in the _Public Registry_, you can submit it manually. Here's how you can do it:
+If you know of a _maker_ that is not yet in the _Public Registry_, you can submit it manually. Here's how you can do it:
-1. Open the _Swap Provider_ list by clicking the right-facing arrow in the widget on the _Swap_ tab.
+1. Open the _maker_ list by clicking the right-facing arrow in the widget on the _Swap_ tab.
@@ -46,5 +46,5 @@ If you know of a _Swap Provider_ that is not yet in the _Public Registry_, you c
display: "inline-block",
// center vertically
verticalAlign: "middle",
- }}/> button. Enter the _Multiaddress_ of the _Swap Provider_ as well as the _Peer ID_ of the provider. Click the _Submit_ button to submit the provider to the _Public Registry_.
+ }}/> button. Enter the _Multiaddress_ of the _maker_ as well as the _Peer ID_ of the provider. Click the _Submit_ button to submit the provider to the _Public Registry_.
diff --git a/docs/pages/usage/refund_punish.mdx b/docs/pages/usage/refund_punish.mdx
index 90a5f8cf0..260218167 100644
--- a/docs/pages/usage/refund_punish.mdx
+++ b/docs/pages/usage/refund_punish.mdx
@@ -8,17 +8,17 @@ We have chosen to include a fairly technical explanation here. However, the GUI
## Cancel
-If the _Swap Provider_ has not been able to redeem the Bitcoin within 12 hours (72 Bitcoin blocks) from the start of the swap, the swap will be cancelled.
-This is done by either you or the _Swap Provider_ publishing a special Bitcoin transaction called the `Bitcoin Cancel Transaction`.
+If the _maker_ has not been able to redeem the Bitcoin within 12 hours (72 Bitcoin blocks) from the start of the swap, the swap will be cancelled.
+This is done by either you or the _maker_ publishing a special Bitcoin transaction called the `Bitcoin Cancel Transaction`.
As soon as this transaction is included in the Bitcoin blockchain, the swap is locked in a state where only the [_Refund_](#refund) and [_Punish_](#punish) paths can be activated. The _Happy Path_ path where you redeem the Monero is no longer possible.
## Refund
As soon as the swap is cancelled, you can refund your Bitcoin. This is done by publishing the `Bitcoin Refund Transaction` on the Bitcoin blockchain.
If this is done within 24 hours (144 Bitcoin blocks) from the inclusion of the `Bitcoin Cancel Transaction`, you will get your Bitcoin back.
-If you do not refund your Bitcoin within this time frame, the _Swap Provider_ can punish you. This is a security measure to ensure that you do not cancel the swap and then refuse to refund your Bitcoin which would result in the _Swap Provider_ losing their Monero.
+If you do not refund your Bitcoin within this time frame, the _maker_ can punish you. This is a security measure to ensure that you do not cancel the swap and then refuse to refund your Bitcoin which would result in the _maker_ losing their Monero.
## Punish
-If you do not refund your Bitcoin within 24 hours (144 Bitcoin blocks) from the inclusion of the `Bitcoin Cancel Transaction`, the _Swap Provider_ will _punish_ you. This will result in the _Swap Provider_ taking your Bitcoin as a penalty for not refunding it in time.
-Even if this state is reached and the _Swap Provider_ has punished you, there's still hope to redeem the Monero. The _Swap Provider_ can choose to allow you to redeem the Monero by transmitting a secret key to you. This however is at the discretion of the _Swap Provider_ and they are not obligated to do so.
\ No newline at end of file
+If you do not refund your Bitcoin within 24 hours (144 Bitcoin blocks) from the inclusion of the `Bitcoin Cancel Transaction`, the _maker_ will _punish_ you. This will result in the _maker_ taking your Bitcoin as a penalty for not refunding it in time.
+Even if this state is reached and the _maker_ has punished you, there's still hope to redeem the Monero. The _maker_ can choose to allow you to redeem the Monero by transmitting a secret key to you. This however is at the discretion of the _maker_ and they are not obligated to do so.
\ No newline at end of file
diff --git a/src-gui/package.json b/src-gui/package.json
index f6e02a560..c6e9b9668 100644
--- a/src-gui/package.json
+++ b/src-gui/package.json
@@ -29,6 +29,7 @@
"@tauri-apps/plugin-updater": "^2.0.0",
"@types/react-redux": "^7.1.34",
"humanize-duration": "^3.32.1",
+ "jdenticon": "^3.3.0",
"lodash": "^4.17.21",
"multiaddr": "^10.0.1",
"notistack": "^3.0.1",
diff --git a/src-gui/src/models/apiModel.ts b/src-gui/src/models/apiModel.ts
index 0ca820507..803f66ac2 100644
--- a/src-gui/src/models/apiModel.ts
+++ b/src-gui/src/models/apiModel.ts
@@ -1,4 +1,4 @@
-export interface ExtendedProviderStatus extends ProviderStatus {
+export interface ExtendedMakerStatus extends MakerStatus {
uptime?: number;
age?: number;
relevancy?: number;
@@ -6,15 +6,15 @@ export interface ExtendedProviderStatus extends ProviderStatus {
recommended?: boolean;
}
-export interface ProviderStatus extends ProviderQuote, Provider {}
+export interface MakerStatus extends MakerQuote, Maker { }
-export interface ProviderQuote {
+export interface MakerQuote {
price: number;
minSwapAmount: number;
maxSwapAmount: number;
}
-export interface Provider {
+export interface Maker {
multiAddr: string;
testnet: boolean;
peerId: string;
diff --git a/src-gui/src/renderer/api.ts b/src-gui/src/renderer/api.ts
index 8e5315eae..8858ddda4 100644
--- a/src-gui/src/renderer/api.ts
+++ b/src-gui/src/renderer/api.ts
@@ -5,21 +5,21 @@
// - and to submit feedback
// - fetch currency rates from CoinGecko
-import { Alert, ExtendedProviderStatus } from "models/apiModel";
+import { Alert, ExtendedMakerStatus } from "models/apiModel";
import { store } from "./store/storeRenderer";
import { setBtcPrice, setXmrBtcRate, setXmrPrice } from "store/features/ratesSlice";
import { FiatCurrency } from "store/features/settingsSlice";
import { setAlerts } from "store/features/alertsSlice";
-import { registryConnectionFailed, setRegistryProviders } from "store/features/providersSlice";
+import { registryConnectionFailed, setRegistryMakers } from "store/features/makersSlice";
import logger from "utils/logger";
const PUBLIC_REGISTRY_API_BASE_URL = "https://api.unstoppableswap.net";
-async function fetchProvidersViaHttp(): Promise<
- ExtendedProviderStatus[]
+async function fetchMakersViaHttp(): Promise<
+ ExtendedMakerStatus[]
> {
const response = await fetch(`${PUBLIC_REGISTRY_API_BASE_URL}/api/list`);
- return (await response.json()) as ExtendedProviderStatus[];
+ return (await response.json()) as ExtendedMakerStatus[];
}
async function fetchAlertsViaHttp(): Promise