Skip to content
This repository has been archived by the owner on Jan 6, 2025. It is now read-only.

Cli to rpc #126

Merged
merged 114 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
62f79d2
Migrate balance and withdraw functionality from spawning a CLI proces…
binarybaron Nov 28, 2022
351cc2e
Migrate rendezvous discovery to RPC API, cleanup
binarybaron Nov 29, 2022
380d2f4
Move RPC functions to own file
binarybaron Nov 30, 2022
62d7e25
Migrate database fetching to RPC API
binarybaron Dec 2, 2022
d7de124
Prettier write, BtcCancelledState doesnt need to exist for BtcRefunded
binarybaron Aug 22, 2023
a3aaa71
Eliminate dead code: database states, redux slices, util functions
binarybaron Aug 24, 2023
8b4e4e6
Remove electrum-cash, sqlite dependencies
binarybaron Aug 24, 2023
8757e08
getCliLogSpanAttribute util function, set SwapId at init
binarybaron Aug 24, 2023
36fd6b5
WIP: Remove all usages of internal database state -> migrate to API, …
binarybaron Aug 29, 2023
87cc5f4
A
binarybaron Aug 29, 2023
4176033
Display BtcPunished page even if SwapInfo is not updated yet but only…
binarybaron Aug 30, 2023
63db663
Always allow SwapDialog to be opened
binarybaron Aug 30, 2023
2d56ff5
Update IpcInvokeButton.tsx
binarybaron Aug 30, 2023
92fc8ca
Delete ElectrumInfoBox.tsx
binarybaron Sep 8, 2023
e5cf83a
Exit swap when rpc daemon crashes
binarybaron Sep 8, 2023
06d572c
Control Rendezvous snackbar from within Dialog instead of external co…
binarybaron Sep 8, 2023
334f651
Don't display snackbar when connecting to public registry
binarybaron Sep 8, 2023
8a72776
IpcInvokeButton: Return data to parent component
binarybaron Aug 29, 2023
1eed488
Display BtcPunished page even if SwapInfo is not updated yet but only…
binarybaron Aug 30, 2023
eea3e5d
Always allow SwapDialog to be opened
binarybaron Aug 30, 2023
44e1bb2
Delete ElectrumInfoBox.tsx
binarybaron Sep 8, 2023
cb59e33
Exit swap when rpc daemon crashes
binarybaron Sep 8, 2023
f7aff96
Control Rendezvous snackbar from within Dialog instead of external co…
binarybaron Sep 8, 2023
574d97b
Don't display snackbar when connecting to public registry
binarybaron Sep 8, 2023
34b4f9d
InitPage: Use IpcInvokeButton
binarybaron Sep 8, 2023
4ee8b3b
Merge branch 'cli-to-rpc' of https://github.com/UnstoppableSwap/unsto…
binarybaron Sep 8, 2023
b6bdd10
IpcInvokeButton: Add React default props
binarybaron Sep 8, 2023
c2a3d9d
Dirs: Take into account legacy log files
binarybaron Sep 8, 2023
82f847e
Import ReactNode directly
binarybaron Sep 8, 2023
21a576c
Attempt to kill `monero-wallet-rpc` using command before and after CL…
binarybaron Sep 23, 2023
4025ebd
Update cli.ts
binarybaron Nov 6, 2023
776ac80
Increase RPC timeout to 5 Minutes
binarybaron Nov 6, 2023
0a84366
Allow for overwrite of swap binary location on testnet
binarybaron Nov 6, 2023
14ba1d7
Clarify that no funds were locked if swap exits before first database…
binarybaron Nov 9, 2023
6868cb3
Do not require SwapWidget to be filled out correctly for SwapDialog t…
binarybaron Nov 9, 2023
806619d
Add current daemon state to Help Page and do not require rpc to be ru…
binarybaron Nov 9, 2023
05664bd
Add "Acquiring swap lock" log to internal parser
binarybaron Nov 9, 2023
4f53eef
Fix rpc batch request wrapper
binarybaron Nov 9, 2023
91fb79d
Fix XmrRedeemInMempoolPage to reflect correct Monero amount
binarybaron Nov 12, 2023
69aae0e
Retrieve tx lock fee from API
binarybaron Nov 23, 2023
62e492c
Increase log box height
binarybaron Nov 23, 2023
b17d90a
Revert "Increase log box height"
binarybaron Nov 23, 2023
4ca5b51
eslint-disable-next-line import/prefer-default-export
binarybaron Nov 27, 2023
22d1b7b
UnfinishedSwapsAlert: Fix grammar for resumableSwapsCount = 1
binarybaron Nov 27, 2023
c179eba
RPC: Make periodic retrieval more explicit
binarybaron Nov 27, 2023
1b01661
UI: Add space between FeedbackInfoBox and TransactionInfoBox on DonePage
binarybaron Nov 27, 2023
1a8ee4f
RPC: Integrate `GetMoneroRecovery` and `force_refresh` parameter
binarybaron Nov 27, 2023
023f608
UI: Hide CancelRefundButton if impossible in current state
binarybaron Nov 27, 2023
5b58896
UI: Add MoneroRecovery Dialog and Button
binarybaron Nov 27, 2023
fe00fb7
UI: Display RPC Error within SwapDialog
binarybaron Nov 27, 2023
a902227
Display error returned by RPC server on SwapDialog
binarybaron Dec 5, 2023
defc1c4
Use wildcard to check for log reference id equality
binarybaron May 23, 2024
db21f8d
Fast scroll button, search function on logs box
binarybaron May 23, 2024
f01a4d5
Update ExpandableSearchBox.tsx
binarybaron May 23, 2024
ac5e0e4
Feat: Server Alerts
binarybaron May 23, 2024
79fca24
feat: Add discord invite link
binarybaron May 24, 2024
7b9b5bf
feat: Inbuild feedback form
binarybaron May 24, 2024
367c938
Remove debug console.log
binarybaron May 24, 2024
1712e57
feat: Use virtuallist for displaying lots of logs
binarybaron May 24, 2024
ec41937
refactor: Component for displaying unit value
binarybaron May 25, 2024
2a55be1
Update Units.tsx
binarybaron May 25, 2024
1497efa
feat: Update cli to 0.12.3
binarybaron May 25, 2024
22f51ad
CI: Install setuptools
binarybaron May 25, 2024
23ec9fe
Bump version to 0.5.3
binarybaron May 25, 2024
3d3b82f
feat: Include RPC logs of current process in when retrieving all log
binarybaron May 25, 2024
af51090
updater: Disallow prerelease download
binarybaron May 25, 2024
8c59d48
refactor: Remove quotes from span log_reference_id
binarybaron May 25, 2024
7544077
feat: Disable transition animations and button ripple effect
binarybaron May 25, 2024
7034c83
feat: Show monero wallet sync state, monero wallet rpc update state a…
binarybaron May 28, 2024
ae38f10
Update IpcInvokeButton.tsx
binarybaron May 28, 2024
ea3cfe2
Refactor: RPC Model, StateStepper, Swap Alerts
binarybaron May 29, 2024
5426660
dep: Update CLI version to 0.13.0
binarybaron May 31, 2024
212bb0a
tests: Remove old tests
binarybaron May 31, 2024
d0d40c0
eslint: Enable switch-exhaustiveness-check
binarybaron May 31, 2024
fdc0831
webpack: Fix jsx-dev-runtime alias issue
binarybaron May 31, 2024
93d8f23
release: Bump version to 0.6.0
binarybaron May 31, 2024
3c0a08a
socket: Route over TOR, force quote over Tor
binarybaron May 31, 2024
25d3d0a
fix: Remove trailing zeroes from unit amount
binarybaron May 31, 2024
297f433
tsconfig: Allow absolute imports
binarybaron May 31, 2024
432f648
feat: Split Redux store into two; Connect to Socket over Tor; Make RP…
binarybaron May 31, 2024
9d72a54
feat: Show loading spinner on Feedback submit button
binarybaron May 31, 2024
d38469e
fix: Do not take swap id from any log
binarybaron May 31, 2024
828309e
feat: Prefill Feedback dropdown if a swap is currently running
binarybaron May 31, 2024
44222ba
fix: Invoke getSwapInfo call if swap is finished
binarybaron May 31, 2024
dba5229
editor: Add vscode config to gitignore
binarybaron May 31, 2024
1028a3c
fix: Check Bitcoin balance after withdrawing coins
binarybaron Jun 1, 2024
3345b38
feat: Sort HistoryTable and Alerts by swap start date
binarybaron Jun 1, 2024
d4ca79c
tsconfig: Remove @ path
binarybaron Jun 1, 2024
d473a26
feat: Display dollar value of Units on mouse hover
binarybaron Jun 1, 2024
2ff9dc0
fix: Display "Locking Bitcoin" page as soon as swap amount is determined
binarybaron Jun 1, 2024
6f89e2f
fix: Make text on SwapMightBeCancelledAlert less threating
binarybaron Jun 1, 2024
bf4a96c
fix: Tor socket
binarybaron Jun 6, 2024
6fa3b63
fmt: Prettier
binarybaron Jun 6, 2024
e72c090
feat: Config function for isExternalRpc
binarybaron Jun 6, 2024
4e4e7f1
ide: Remove vscode launch config
binarybaron Jun 6, 2024
30c2c82
chore: Wording on SwapMightBeCancelled
binarybaron Jun 6, 2024
ee43ffb
feat: Config function for stub testnet provider
binarybaron Jun 6, 2024
0aedb4d
chore: Change import paths from relative to absolute (where appropiate)
binarybaron Jun 7, 2024
e5893c3
Merge branch 'main' into cli-to-rpc
binarybaron Jun 7, 2024
519d4df
merge: Amend e5893c35269dd15e406c2e6bf9ea1390174fd8de
binarybaron Jun 7, 2024
8958403
feat: Parse new "Waiting for deposit" log message
binarybaron Jun 7, 2024
8dc2a63
fmt: Prettier
binarybaron Jun 7, 2024
feb43ff
fmt: Imports
binarybaron Jun 10, 2024
93da858
feat: Start Tor at startup (if no stub testnet provider is present)
binarybaron Jun 10, 2024
15811a7
fix: Absolute imports in main process
binarybaron Jun 12, 2024
4e6fc19
feat: Display update dialog in React, store update infos in Redux
binarybaron Jun 12, 2024
0fe105d
chore: Remove blocked-at npm package, setZoomFactor to 1.2
binarybaron Jun 12, 2024
bcd5a26
feat: Fetch timelocks from RPC when new Bitcoin block is found
binarybaron Jun 12, 2024
beac137
cli: Update to 0.13.1
binarybaron Jun 12, 2024
d4ae3c1
fix: Update estimated time for states
binarybaron Jun 12, 2024
b6e8633
chore: Fix padding for SwapWidget and Alerts
binarybaron Jun 12, 2024
9e03a27
refactor: Change onLog callback for spawnSubcommand to take parsed an…
binarybaron Jun 12, 2024
58ca101
fix: Wrong message for CliLogFinishedSyncingMoneroWallet
binarybaron Jun 12, 2024
2a8e8fb
fmt: Prettier
binarybaron Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .erb/configs/webpack.config.base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ const configuration: webpack.Configuration = {
fallback: {
path: require.resolve('path-browserify'),
},
alias: {
'react/jsx-dev-runtime': 'react/jsx-dev-runtime.js',
'react/jsx-runtime': 'react/jsx-runtime.js',
},
},

plugins: [
Expand Down
10 changes: 6 additions & 4 deletions .erb/scripts/download-swap-binaries.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import path from 'path';
import download from 'download';
import { chmod, emptyDir, ensureDir, stat } from 'fs-extra';
import { Binary } from '../../src/models/downloaderModel';
import { constants } from 'fs';
import { Binary } from '../../src/models/downloaderModel';

const swapBinDir = path.join(__dirname, '../../build/bin/swap');

Expand All @@ -16,20 +16,22 @@ async function makeFileExecutable(binary: Binary) {
);
}

const CLI_VERSION = '0.13.1';

const binaries = [
{
dest: path.join(swapBinDir, 'linux'),
url: 'https://github.com/comit-network/xmr-btc-swap/releases/download/0.12.3/swap_0.12.3_Linux_x86_64.tar',
url: `https://github.com/comit-network/xmr-btc-swap/releases/download/${CLI_VERSION}/swap_${CLI_VERSION}_Linux_x86_64.tar`,
filename: 'swap',
},
{
dest: path.join(swapBinDir, 'mac'),
url: 'https://github.com/comit-network/xmr-btc-swap/releases/download/0.12.3/swap_0.12.3_Darwin_x86_64.tar',
url: `https://github.com/comit-network/xmr-btc-swap/releases/download/${CLI_VERSION}/swap_${CLI_VERSION}_Darwin_x86_64.tar`,
filename: 'swap',
},
{
dest: path.join(swapBinDir, 'win'),
url: 'https://github.com/comit-network/xmr-btc-swap/releases/download/0.12.3/swap_0.12.3_Windows_x86_64.zip',
url: `https://github.com/comit-network/xmr-btc-swap/releases/download/${CLI_VERSION}/swap_${CLI_VERSION}_Windows_x86_64.zip`,
filename: 'swap.exe',
},
];
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {
'react/jsx-no-bind': 'off',
'promise/param-names': 'off',
'no-async-promise-executor': 'off',
'no-await-in-loop': 'off',
'import/prefer-default-export': 'off',
'import/no-restricted-paths': [
'error',
Expand All @@ -19,6 +20,7 @@ module.exports = {
],
},
],
'@typescript-eslint/switch-exhaustiveness-check': 'error',
},
parserOptions: {
ecmaVersion: 2020,
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4-Problem_With_Swap.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ labels: 'Ongoing swap'
## Your Environment

- Operating System:
- GUI Version:
- GUI Version:
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ npm-debug.log.*
*.css.d.ts
*.sass.d.ts
*.scss.d.ts
.vscode/launch.json
30 changes: 0 additions & 30 deletions .vscode/launch.json

This file was deleted.

Loading
Loading