diff --git a/cmd/swapcli/main.go b/cmd/swapcli/main.go
index fd1c86871..485024f4a 100644
--- a/cmd/swapcli/main.go
+++ b/cmd/swapcli/main.go
@@ -76,6 +76,20 @@ func cliApp() *cli.App {
swapdPortFlag,
},
},
+ {
+ Name: "pairs",
+ Aliases: []string{"p"},
+ Usage: "List active pairs",
+ Action: runPairs,
+ Flags: []cli.Flag{
+ swapdPortFlag,
+ &cli.Uint64Flag{
+ Name: flagSearchTime,
+ Usage: "Duration of time to search for, in seconds",
+ Value: defaultDiscoverSearchTimeSecs,
+ },
+ },
+ },
{
Name: "balances",
Aliases: []string{"b"},
@@ -536,6 +550,39 @@ func runPeers(ctx *cli.Context) error {
return nil
}
+func runPairs(ctx *cli.Context) error {
+ searchTime := ctx.Uint64(flagSearchTime)
+
+ c := newClient(ctx)
+ resp, err := c.Pairs(searchTime)
+ if err != nil {
+ return err
+ }
+
+ for i, a := range resp.Pairs {
+ var verified string
+ if a.Verified {
+ verified = "Yes"
+ } else {
+ verified = "No"
+ }
+
+ fmt.Printf("Pair %d:\n", i+1)
+ fmt.Printf(" Name: %s\n", a.Token.Symbol)
+ fmt.Printf(" Token: %s\n", a.Token.Address)
+ fmt.Printf(" Verified: %s\n", verified)
+ fmt.Printf(" Offers: %d\n", a.Offers)
+ fmt.Printf(" Reported Liquidity XMR: %f\n", a.ReportedLiquidityXMR)
+ fmt.Println()
+ }
+
+ if len(resp.Pairs) == 0 {
+ fmt.Println("[none]")
+ }
+
+ return nil
+}
+
func runBalances(ctx *cli.Context) error {
c := newClient(ctx)
diff --git a/common/rpctypes/types.go b/common/rpctypes/types.go
index 2112fd784..3b41c800b 100644
--- a/common/rpctypes/types.go
+++ b/common/rpctypes/types.go
@@ -147,3 +147,13 @@ type AddressesResponse struct {
type PeersResponse struct {
Addrs []string `json:"addresses" validate:"dive,required"`
}
+
+// PairsRequest ...
+type PairsRequest struct {
+ SearchTime uint64 `json:"searchTime"` // in seconds
+}
+
+// PairsResponse ...
+type PairsResponse struct {
+ Pairs []*types.Pair
+}
diff --git a/common/types/pairs.go b/common/types/pairs.go
new file mode 100644
index 000000000..7d748e910
--- /dev/null
+++ b/common/types/pairs.go
@@ -0,0 +1,44 @@
+// Copyright 2023 The AthanorLabs/atomic-swap Authors
+// SPDX-License-Identifier: LGPL-3.0-only
+
+package types
+
+import (
+ "github.com/cockroachdb/apd/v3"
+
+ "github.com/athanorlabs/atomic-swap/coins"
+)
+
+// Pair represents a pair (Such as ETH / XMR)
+type Pair struct {
+ ReportedLiquidityXMR *apd.Decimal `json:"reportedLiquidityXmr" validate:"required"`
+ EthAsset EthAsset `json:"ethAsset" validate:"required"`
+ Token coins.ERC20TokenInfo `json:"token" validate:"required"`
+ Offers uint64 `json:"offers" validate:"required"`
+ Verified bool `json:"verified" valdate:"required"`
+}
+
+// NewPair creates and returns a Pair
+func NewPair(EthAsset EthAsset) *Pair {
+ pair := &Pair{
+ ReportedLiquidityXMR: apd.New(0, 0),
+ EthAsset: EthAsset,
+
+ // Always set to false for now until the verified-list
+ // is implemented
+ Verified: false,
+ }
+ return pair
+}
+
+// AddOffer adds an offer to a pair
+func (pair *Pair) AddOffer(o *Offer) error {
+ _, err := coins.DecimalCtx().Add(pair.ReportedLiquidityXMR, pair.ReportedLiquidityXMR, o.MaxAmount)
+ if err != nil {
+ return err
+ }
+
+ pair.Offers++
+
+ return nil
+}
diff --git a/rpc/net.go b/rpc/net.go
index 942643f95..6767c8ff6 100644
--- a/rpc/net.go
+++ b/rpc/net.go
@@ -4,6 +4,7 @@
package rpc
import (
+ "context"
"fmt"
"net/http"
"time"
@@ -18,6 +19,8 @@ import (
"github.com/athanorlabs/atomic-swap/common/types"
"github.com/athanorlabs/atomic-swap/net/message"
"github.com/athanorlabs/atomic-swap/protocol/swap"
+
+ ethcommon "github.com/ethereum/go-ethereum/common"
)
const defaultSearchTime = time.Second * 12
@@ -35,19 +38,31 @@ type Net interface {
// NetService is the RPC service prefixed by net_.
type NetService struct {
+ ctx context.Context
net Net
xmrtaker XMRTaker
xmrmaker XMRMaker
+ pb ProtocolBackend
sm swap.Manager
isBootnode bool
}
// NewNetService ...
-func NewNetService(net Net, xmrtaker XMRTaker, xmrmaker XMRMaker, sm swap.Manager, isBootnode bool) *NetService {
+func NewNetService(
+ ctx context.Context,
+ net Net,
+ xmrtaker XMRTaker,
+ xmrmaker XMRMaker,
+ pb ProtocolBackend,
+ sm swap.Manager,
+ isBootnode bool,
+) *NetService {
return &NetService{
+ ctx: ctx,
net: net,
xmrtaker: xmrtaker,
xmrmaker: xmrmaker,
+ pb: pb,
sm: sm,
isBootnode: isBootnode,
}
@@ -73,6 +88,75 @@ func (s *NetService) Peers(_ *http.Request, _ *interface{}, resp *rpctypes.Peers
return nil
}
+// Pairs returns all currently available pairs from offers of all peers
+func (s *NetService) Pairs(_ *http.Request, req *rpctypes.PairsRequest, resp *rpctypes.PairsResponse) error {
+ if s.isBootnode {
+ return errUnsupportedForBootnode
+ }
+
+ peerIDs, err := s.discover(&rpctypes.DiscoverRequest{
+ Provides: "",
+ SearchTime: req.SearchTime,
+ })
+ if err != nil {
+ return err
+ }
+
+ pairs := make(map[ethcommon.Address]*types.Pair)
+
+ for _, p := range peerIDs {
+ msg, err := s.net.Query(p)
+ if err != nil {
+ log.Debugf("Failed to query peer ID %s", p)
+ continue
+ }
+
+ if len(msg.Offers) == 0 {
+ continue
+ }
+
+ for _, o := range msg.Offers {
+ address := o.EthAsset.Address()
+ pair, exists := pairs[address]
+
+ if !exists {
+ pair = types.NewPair(o.EthAsset)
+ if pair.EthAsset.IsToken() {
+ tokenInfo, tokenInfoErr := s.pb.ETHClient().ERC20Info(s.ctx, address)
+ if tokenInfoErr != nil {
+ log.Debugf("Error while reading token info: %s", tokenInfoErr)
+ continue
+ }
+ pair.Token = *tokenInfo
+ } else {
+ pair.Token.Name = "Ether"
+ pair.Token.Symbol = "ETH"
+ pair.Token.NumDecimals = 18
+ pair.Verified = true
+ }
+ pairs[address] = pair
+ }
+
+ err = pair.AddOffer(o)
+ if err != nil {
+ return err
+ }
+ }
+ }
+
+ pairsArray := make([]*types.Pair, 0, len(pairs))
+ for _, pair := range pairs {
+ if pair.EthAsset.IsETH() {
+ pairsArray = append([]*types.Pair{pair}, pairsArray...)
+ } else {
+ pairsArray = append(pairsArray, pair)
+ }
+ }
+
+ resp.Pairs = pairsArray
+ return nil
+}
+
// QueryAll discovers peers who provide a certain coin and queries all of them for their current offers.
func (s *NetService) QueryAll(_ *http.Request, req *rpctypes.QueryAllRequest, resp *rpctypes.QueryAllResponse) error {
if s.isBootnode {
diff --git a/rpc/server.go b/rpc/server.go
index e9a124549..121acba73 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -107,7 +107,15 @@ func NewServer(cfg *Config) (*Server, error) {
case DatabaseNamespace:
err = rpcServer.RegisterService(NewDatabaseService(cfg.RecoveryDB), DatabaseNamespace)
case NetNamespace:
- netService = NewNetService(cfg.Net, cfg.XMRTaker, cfg.XMRMaker, swapManager, isBootnode)
+ netService = NewNetService(
+ serverCtx,
+ cfg.Net,
+ cfg.XMRTaker,
+ cfg.XMRMaker,
+ cfg.ProtocolBackend,
+ swapManager,
+ isBootnode,
+ )
err = rpcServer.RegisterService(netService, NetNamespace)
case PersonalName:
err = rpcServer.RegisterService(NewPersonalService(serverCtx, cfg.XMRMaker, cfg.ProtocolBackend), PersonalName)
diff --git a/rpcclient/net_test.go b/rpcclient/net_test.go
index 43eb4ff45..b4310b24a 100644
--- a/rpcclient/net_test.go
+++ b/rpcclient/net_test.go
@@ -4,6 +4,7 @@
package rpcclient
import (
+ "context"
"testing"
"github.com/cockroachdb/apd/v3"
@@ -15,7 +16,12 @@ import (
)
func TestNet_Discover(t *testing.T) {
- ns := rpc.NewNetService(new(mockNet), new(mockXMRTaker), nil, mockSwapManager(t), false)
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(func() {
+ cancel()
+ })
+
+ ns := rpc.NewNetService(ctx, new(mockNet), new(mockXMRTaker), nil, new(mockProtocolBackend), mockSwapManager(t), false)
req := &rpctypes.DiscoverRequest{
Provides: "",
@@ -29,7 +35,12 @@ func TestNet_Discover(t *testing.T) {
}
func TestNet_Query(t *testing.T) {
- ns := rpc.NewNetService(new(mockNet), new(mockXMRTaker), nil, mockSwapManager(t), false)
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(func() {
+ cancel()
+ })
+
+ ns := rpc.NewNetService(ctx, new(mockNet), new(mockXMRTaker), nil, new(mockProtocolBackend), mockSwapManager(t), false)
req := &rpctypes.QueryPeerRequest{
PeerID: "12D3KooWDqCzbjexHEa8Rut7bzxHFpRMZyDRW1L6TGkL1KY24JH5",
@@ -43,7 +54,12 @@ func TestNet_Query(t *testing.T) {
}
func TestNet_TakeOffer(t *testing.T) {
- ns := rpc.NewNetService(new(mockNet), new(mockXMRTaker), nil, mockSwapManager(t), false)
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(func() {
+ cancel()
+ })
+
+ ns := rpc.NewNetService(ctx, new(mockNet), new(mockXMRTaker), nil, new(mockProtocolBackend), mockSwapManager(t), false)
req := &rpctypes.TakeOfferRequest{
PeerID: "12D3KooWDqCzbjexHEa8Rut7bzxHFpRMZyDRW1L6TGkL1KY24JH5",
diff --git a/rpcclient/pairs.go b/rpcclient/pairs.go
new file mode 100644
index 000000000..40f5d9c13
--- /dev/null
+++ b/rpcclient/pairs.go
@@ -0,0 +1,27 @@
+// Copyright 2023 The AthanorLabs/atomic-swap Authors
+// SPDX-License-Identifier: LGPL-3.0-only
+
+package rpcclient
+
+import (
+ "github.com/athanorlabs/atomic-swap/common/rpctypes"
+)
+
+// Pairs calls net_pairs to get pairs from all offers.
+func (c *Client) Pairs(searchTime uint64) (*rpctypes.PairsResponse, error) {
+ const (
+ method = "net_pairs"
+ )
+
+ req := &rpctypes.PairsRequest{
+ SearchTime: searchTime,
+ }
+
+ res := &rpctypes.PairsResponse{}
+
+ if err := c.post(method, req, res); err != nil {
+ return nil, err
+ }
+
+ return res, nil
+}
diff --git a/tests/integration_test.go b/tests/integration_test.go
index 4bdbc1b9c..baee33900 100644
--- a/tests/integration_test.go
+++ b/tests/integration_test.go
@@ -129,6 +129,54 @@ func (s *IntegrationTestSuite) TestXMRMaker_Discover() {
require.Equal(s.T(), 0, len(peerIDs))
}
+func (s *IntegrationTestSuite) TestXMRMaker_Pairs() {
+ ctx := context.Background()
+ bc := rpcclient.NewClient(ctx, defaultXMRMakerSwapdPort)
+
+ _, err := bc.MakeOffer(
+ coins.StrToDecimal("1"),
+ coins.StrToDecimal("2"),
+ coins.StrToExchangeRate("200"),
+ s.testToken,
+ false)
+
+ require.NoError(s.T(), err)
+
+ _, err = bc.MakeOffer(
+ coins.StrToDecimal("1"),
+ coins.StrToDecimal("2"),
+ coins.StrToExchangeRate("200"),
+ types.EthAssetETH,
+ false)
+
+ require.NoError(s.T(), err)
+
+ _, err = bc.MakeOffer(
+ coins.StrToDecimal("1"),
+ coins.StrToDecimal("2"),
+ coins.StrToExchangeRate("200"),
+ types.EthAssetETH,
+ false)
+
+ require.NoError(s.T(), err)
+
+ // Give offer advertisement time to propagate
+ require.NoError(s.T(), common.SleepWithContext(ctx, time.Second))
+
+ ac := rpcclient.NewClient(ctx, defaultXMRTakerSwapdPort)
+ pairs, err := ac.Pairs(3)
+
+ require.Equal(s.T(), len(pairs.Pairs), 2)
+
+ p1 := pairs.Pairs[0]
+ p2 := pairs.Pairs[1]
+
+ require.Equal(s.T(), p1.Offers, uint64(2))
+ require.Equal(s.T(), p2.Offers, uint64(1))
+
+ require.NoError(s.T(), err)
+}
+
func (s *IntegrationTestSuite) TestXMRTaker_Query() {
s.testXMRTakerQuery(types.EthAssetETH)
}
diff --git a/ui/.gitignore b/ui/.gitignore
index a547bf36d..5e5d5e0f2 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -22,3 +22,12 @@ dist-ssr
*.njsproj
*.sln
*.sw?
+
+/build
+/.svelte-kit
+/package
+.env
+.env.*
+!.env.example
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
diff --git a/ui/.prettierignore b/ui/.prettierignore
new file mode 100644
index 000000000..38972655f
--- /dev/null
+++ b/ui/.prettierignore
@@ -0,0 +1,13 @@
+.DS_Store
+node_modules
+/build
+/.svelte-kit
+/package
+.env
+.env.*
+!.env.example
+
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock
diff --git a/ui/.prettierrc b/ui/.prettierrc
new file mode 100644
index 000000000..a77fddea9
--- /dev/null
+++ b/ui/.prettierrc
@@ -0,0 +1,9 @@
+{
+ "useTabs": true,
+ "singleQuote": true,
+ "trailingComma": "none",
+ "printWidth": 100,
+ "plugins": ["prettier-plugin-svelte"],
+ "pluginSearchDirs": ["."],
+ "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+}
diff --git a/ui/.svelte-kit/ambient.d.ts b/ui/.svelte-kit/ambient.d.ts
new file mode 100644
index 000000000..574677aae
--- /dev/null
+++ b/ui/.svelte-kit/ambient.d.ts
@@ -0,0 +1,221 @@
+
+// this file is generated — do not edit it
+
+
+///
+
+/**
+ * Environment variables [loaded by Vite](https://vitejs.dev/guide/env-and-mode.html#env-files) from `.env` files and `process.env`. Like [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-private), this module cannot be imported into client-side code. This module only includes variables that _do not_ begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#env) _and do_ start with [`config.kit.env.privatePrefix`](https://kit.svelte.dev/docs/configuration#env) (if configured).
+ *
+ * _Unlike_ [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-private), the values exported from this module are statically injected into your bundle at build time, enabling optimisations like dead code elimination.
+ *
+ * ```ts
+ * import { API_KEY } from '$env/static/private';
+ * ```
+ *
+ * Note that all environment variables referenced in your code should be declared (for example in an `.env` file), even if they don't have a value until the app is deployed:
+ *
+ * ```
+ * MY_FEATURE_FLAG=""
+ * ```
+ *
+ * You can override `.env` values from the command line like so:
+ *
+ * ```bash
+ * MY_FEATURE_FLAG="enabled" npm run dev
+ * ```
+ */
+declare module '$env/static/private' {
+ export const SHELL: string;
+ export const npm_command: string;
+ export const LSCOLORS: string;
+ export const WINDOWID: string;
+ export const npm_config_userconfig: string;
+ export const COLORTERM: string;
+ export const npm_config_cache: string;
+ export const LESS: string;
+ export const NVM_INC: string;
+ export const CONDA_EXE: string;
+ export const _CE_M: string;
+ export const I3SOCK: string;
+ export const NODE: string;
+ export const COLOR: string;
+ export const npm_config_local_prefix: string;
+ export const KITTY_PID: string;
+ export const npm_config_globalconfig: string;
+ export const EDITOR: string;
+ export const GTK_MODULES: string;
+ export const XDG_SEAT: string;
+ export const PWD: string;
+ export const LOGNAME: string;
+ export const XDG_SESSION_TYPE: string;
+ export const npm_config_init_module: string;
+ export const _: string;
+ export const XAUTHORITY: string;
+ export const DESKTOP_STARTUP_ID: string;
+ export const KITTY_PUBLIC_KEY: string;
+ export const MOTD_SHOWN: string;
+ export const HOME: string;
+ export const LANG: string;
+ export const LS_COLORS: string;
+ export const npm_package_version: string;
+ export const KITTY_WINDOW_ID: string;
+ export const INIT_CWD: string;
+ export const npm_lifecycle_script: string;
+ export const NVM_DIR: string;
+ export const XDG_SESSION_CLASS: string;
+ export const TERMINFO: string;
+ export const TERM: string;
+ export const npm_package_name: string;
+ export const ZSH: string;
+ export const _CE_CONDA: string;
+ export const npm_config_prefix: string;
+ export const USER: string;
+ export const CONDA_SHLVL: string;
+ export const DISPLAY: string;
+ export const npm_lifecycle_event: string;
+ export const SHLVL: string;
+ export const NVM_CD_FLAGS: string;
+ export const PAGER: string;
+ export const XDG_VTNR: string;
+ export const XDG_SESSION_ID: string;
+ export const npm_config_user_agent: string;
+ export const npm_execpath: string;
+ export const CONDA_PYTHON_EXE: string;
+ export const XDG_RUNTIME_DIR: string;
+ export const DEBUGINFOD_URLS: string;
+ export const npm_package_json: string;
+ export const npm_config_noproxy: string;
+ export const PATH: string;
+ export const npm_config_metrics_registry: string;
+ export const npm_config_node_gyp: string;
+ export const DBUS_SESSION_BUS_ADDRESS: string;
+ export const npm_config_global_prefix: string;
+ export const NVM_BIN: string;
+ export const MAIL: string;
+ export const npm_config_scripts_prepend_node_path: string;
+ export const KITTY_INSTALLATION_DIR: string;
+ export const npm_node_execpath: string;
+ export const OLDPWD: string;
+ export const NODE_ENV: string;
+}
+
+/**
+ * Similar to [`$env/static/private`](https://kit.svelte.dev/docs/modules#$env-static-private), except that it only includes environment variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#env) (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code.
+ *
+ * Values are replaced statically at build time.
+ *
+ * ```ts
+ * import { PUBLIC_BASE_URL } from '$env/static/public';
+ * ```
+ */
+declare module '$env/static/public' {
+
+}
+
+/**
+ * This module provides access to runtime environment variables, as defined by the platform you're running on. For example if you're using [`adapter-node`](https://github.com/sveltejs/kit/tree/master/packages/adapter-node) (or running [`vite preview`](https://kit.svelte.dev/docs/cli)), this is equivalent to `process.env`. This module only includes variables that _do not_ begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#env) _and do_ start with [`config.kit.env.privatePrefix`](https://kit.svelte.dev/docs/configuration#env) (if configured).
+ *
+ * This module cannot be imported into client-side code.
+ *
+ * ```ts
+ * import { env } from '$env/dynamic/private';
+ * console.log(env.DEPLOYMENT_SPECIFIC_VARIABLE);
+ * ```
+ *
+ * > In `dev`, `$env/dynamic` always includes environment variables from `.env`. In `prod`, this behavior will depend on your adapter.
+ */
+declare module '$env/dynamic/private' {
+ export const env: {
+ SHELL: string;
+ npm_command: string;
+ LSCOLORS: string;
+ WINDOWID: string;
+ npm_config_userconfig: string;
+ COLORTERM: string;
+ npm_config_cache: string;
+ LESS: string;
+ NVM_INC: string;
+ CONDA_EXE: string;
+ _CE_M: string;
+ I3SOCK: string;
+ NODE: string;
+ COLOR: string;
+ npm_config_local_prefix: string;
+ KITTY_PID: string;
+ npm_config_globalconfig: string;
+ EDITOR: string;
+ GTK_MODULES: string;
+ XDG_SEAT: string;
+ PWD: string;
+ LOGNAME: string;
+ XDG_SESSION_TYPE: string;
+ npm_config_init_module: string;
+ _: string;
+ XAUTHORITY: string;
+ DESKTOP_STARTUP_ID: string;
+ KITTY_PUBLIC_KEY: string;
+ MOTD_SHOWN: string;
+ HOME: string;
+ LANG: string;
+ LS_COLORS: string;
+ npm_package_version: string;
+ KITTY_WINDOW_ID: string;
+ INIT_CWD: string;
+ npm_lifecycle_script: string;
+ NVM_DIR: string;
+ XDG_SESSION_CLASS: string;
+ TERMINFO: string;
+ TERM: string;
+ npm_package_name: string;
+ ZSH: string;
+ _CE_CONDA: string;
+ npm_config_prefix: string;
+ USER: string;
+ CONDA_SHLVL: string;
+ DISPLAY: string;
+ npm_lifecycle_event: string;
+ SHLVL: string;
+ NVM_CD_FLAGS: string;
+ PAGER: string;
+ XDG_VTNR: string;
+ XDG_SESSION_ID: string;
+ npm_config_user_agent: string;
+ npm_execpath: string;
+ CONDA_PYTHON_EXE: string;
+ XDG_RUNTIME_DIR: string;
+ DEBUGINFOD_URLS: string;
+ npm_package_json: string;
+ npm_config_noproxy: string;
+ PATH: string;
+ npm_config_metrics_registry: string;
+ npm_config_node_gyp: string;
+ DBUS_SESSION_BUS_ADDRESS: string;
+ npm_config_global_prefix: string;
+ NVM_BIN: string;
+ MAIL: string;
+ npm_config_scripts_prepend_node_path: string;
+ KITTY_INSTALLATION_DIR: string;
+ npm_node_execpath: string;
+ OLDPWD: string;
+ NODE_ENV: string;
+ [key: `PUBLIC_${string}`]: undefined;
+ [key: `${string}`]: string | undefined;
+ }
+}
+
+/**
+ * Similar to [`$env/dynamic/private`](https://kit.svelte.dev/docs/modules#$env-dynamic-private), but only includes variables that begin with [`config.kit.env.publicPrefix`](https://kit.svelte.dev/docs/configuration#env) (which defaults to `PUBLIC_`), and can therefore safely be exposed to client-side code.
+ *
+ * Note that public dynamic environment variables must all be sent from the server to the client, causing larger network requests — when possible, use `$env/static/public` instead.
+ *
+ * ```ts
+ * import { env } from '$env/dynamic/public';
+ * console.log(env.PUBLIC_DEPLOYMENT_SPECIFIC_VARIABLE);
+ * ```
+ */
+declare module '$env/dynamic/public' {
+ export const env: {
+ [key: `PUBLIC_${string}`]: string | undefined;
+ }
+}
diff --git a/ui/.svelte-kit/generated/client/app.js b/ui/.svelte-kit/generated/client/app.js
new file mode 100644
index 000000000..f2f11388a
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/app.js
@@ -0,0 +1,21 @@
+export { matchers } from './matchers.js';
+
+export const nodes = [
+ () => import('./nodes/0'),
+ () => import('./nodes/1'),
+ () => import('./nodes/2'),
+ () => import('./nodes/3')
+];
+
+export const server_loads = [];
+
+export const dictionary = {
+ "/": [2],
+ "/offers/[token]": [3]
+ };
+
+export const hooks = {
+ handleError: (({ error }) => { console.error(error) }),
+};
+
+export { default as root } from '../root.svelte';
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/matchers.js b/ui/.svelte-kit/generated/client/matchers.js
new file mode 100644
index 000000000..f6bd30a4e
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/matchers.js
@@ -0,0 +1 @@
+export const matchers = {};
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/nodes/0.js b/ui/.svelte-kit/generated/client/nodes/0.js
new file mode 100644
index 000000000..fed1375f7
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/nodes/0.js
@@ -0,0 +1 @@
+export { default as component } from "../../../../src/routes/+layout.svelte";
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/nodes/1.js b/ui/.svelte-kit/generated/client/nodes/1.js
new file mode 100644
index 000000000..35bc24b38
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/nodes/1.js
@@ -0,0 +1 @@
+export { default as component } from "../../../../node_modules/@sveltejs/kit/src/runtime/components/error.svelte";
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/nodes/2.js b/ui/.svelte-kit/generated/client/nodes/2.js
new file mode 100644
index 000000000..1cb4f8552
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/nodes/2.js
@@ -0,0 +1 @@
+export { default as component } from "../../../../src/routes/+page.svelte";
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/nodes/3.js b/ui/.svelte-kit/generated/client/nodes/3.js
new file mode 100644
index 000000000..01cb8622b
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/nodes/3.js
@@ -0,0 +1,3 @@
+import * as universal from "../../../../src/routes/offers/[token]/+page.ts";
+export { universal };
+export { default as component } from "../../../../src/routes/offers/[token]/+page.svelte";
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/client/nodes/4.js b/ui/.svelte-kit/generated/client/nodes/4.js
new file mode 100644
index 000000000..fa9132006
--- /dev/null
+++ b/ui/.svelte-kit/generated/client/nodes/4.js
@@ -0,0 +1 @@
+export { default as component } from "../../../../src/routes/pairs/+page.svelte";
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/root.svelte b/ui/.svelte-kit/generated/root.svelte
new file mode 100644
index 000000000..e0615652c
--- /dev/null
+++ b/ui/.svelte-kit/generated/root.svelte
@@ -0,0 +1,54 @@
+
+
+
+{#if constructors[1]}
+
+
+
+{:else}
+
+{/if}
+
+{#if mounted}
+
+ {#if navigated}
+ {title}
+ {/if}
+
+{/if}
\ No newline at end of file
diff --git a/ui/.svelte-kit/generated/server/internal.js b/ui/.svelte-kit/generated/server/internal.js
new file mode 100644
index 000000000..8487449e8
--- /dev/null
+++ b/ui/.svelte-kit/generated/server/internal.js
@@ -0,0 +1,30 @@
+
+import root from '../root.svelte';
+import { set_building } from '__sveltekit/environment';
+import { set_assets } from '__sveltekit/paths';
+import { set_private_env, set_public_env } from '../../../node_modules/@sveltejs/kit/src/runtime/shared-server.js';
+
+export const options = {
+ app_template_contains_nonce: false,
+ csp: {"mode":"auto","directives":{"upgrade-insecure-requests":false,"block-all-mixed-content":false},"reportOnly":{"upgrade-insecure-requests":false,"block-all-mixed-content":false}},
+ csrf_check_origin: true,
+ track_server_fetches: false,
+ embedded: false,
+ env_public_prefix: 'PUBLIC_',
+ env_private_prefix: '',
+ hooks: null, // added lazily, via `get_hooks`
+ preload_strategy: "modulepreload",
+ root,
+ service_worker: false,
+ templates: {
+ app: ({ head, body, assets, nonce, env }) => "\n\n\t\n\t\t\n\t\t\n\t\t\n\t\t" + head + "\n\t\n\t\n\t\t" + body + "
\n\t\n\n",
+ error: ({ status, message }) => "\n\n\t\n\t\t\n\t\t" + message + "\n\n\t\t\n\t\n\t\n\t\t\n\t\t\t
" + status + "\n\t\t\t
\n\t\t\t\t
" + message + "
\n\t\t\t\n\t\t
- 
- ETH / XMR
+
+ {tokenInfo.symbol} / XMR
-
- {sortedOffers.length} Offers
-
+ { count } Offers
{#if sortedOffers.length > 0}
-
+
Peer
Offer Id
@@ -55,8 +59,8 @@
{offer.offerID.slice(0,8)}
{offer.exchangeRate}
- {offer.minAmount}
- {offer.maxAmount}
+ {Number(offer.minAmount)}
+ {Number(offer.maxAmount)}
@@ -81,4 +85,4 @@
:global(.identicon > canvas) {
border-radius: 50%;
}
-
\ No newline at end of file
+
diff --git a/ui/src/lib/TakeDealDialog.svelte b/ui/src/lib/TakeDealDialog.svelte
index 5a8297cda..348dd527a 100644
--- a/ui/src/lib/TakeDealDialog.svelte
+++ b/ui/src/lib/TakeDealDialog.svelte
@@ -2,6 +2,7 @@
import type { CancelResult } from '../types/Cancel'
import type { NetTakeOfferSyncResult } from '../types/NetTakeOfferSync'
import { getCorrespondingToken, rpcRequest, getPort } from '../utils'
+ import type { TokenInfo } from '../types'
import { selectedOffer } from '../stores/offerStore'
import { getPeers } from '../stores/peerStore'
//import { currentAccount, sign } from '../stores/metamask'
@@ -11,6 +12,7 @@
import { Badge, Label, Input, Helper, InputAddon, ButtonGroup, Spinner } from 'flowbite-svelte'
import { CheckSolid, XmarkSolid } from 'svelte-awesome-icons';
+ import TokenIcon from '$lib/TokenIcon.svelte';
import eth from '../assets/coins/eth.png'
@@ -25,6 +27,8 @@
let swapError = ''
let swapStatus = ''
+ export let tokenInfo: TokenInfo
+
$: willReceive =
amountProvided && amountProvided > 0 && $selectedOffer?.exchangeRate
? amountProvided / $selectedOffer.exchangeRate
@@ -146,7 +150,7 @@
diff --git a/ui/src/lib/TokenIcon.svelte b/ui/src/lib/TokenIcon.svelte
new file mode 100644
index 000000000..57d8557a3
--- /dev/null
+++ b/ui/src/lib/TokenIcon.svelte
@@ -0,0 +1,27 @@
+
+
+
+
+
+
diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte
new file mode 100644
index 000000000..a015cff7a
--- /dev/null
+++ b/ui/src/routes/+layout.svelte
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
new file mode 100644
index 000000000..0035fae50
--- /dev/null
+++ b/ui/src/routes/+page.svelte
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pairs
+
+ {$pairs.length} Pairs
+
+
+
+
+ Reported Liquidity
+
+ {$liquidity} XMR
+
+
+
+
+ Offers
+
+ {$offers}
+
+
+
+
+ {#if filteredPairs.length > 0}
+
+
+ Ticker
+ Reported Liquidity
+ Offers
+
+
+
+ {#each filteredPairs as pair (pair.token.symbol)}
+
+
+
+
+
{pair.token.symbol}
+ {#if pair.verified}
+
Verified
+ {:else}
+
Unverified
+ {/if}
+
+ {:else}
+
No pairs found.
+ {/if}
+
+ {#if offers }
+ {#await tokenInfoPromise}
+
+ {:then token}
+
+
+ {:catch error}
+
+
{error.message}
+ {/await}
+ {:else}
+
loading...
+ {/if}
+