From 709a2820c4f87eb91466b6c4c129699b09453a9a Mon Sep 17 00:00:00 2001 From: binarybaron Date: Thu, 8 Aug 2024 00:49:04 +0200 Subject: [PATCH] feat: cargo project at root --- .gitignore | 1 + src-xmr-btc-swap/CHANGELOG.md => CHANGELOG.md | 0 .../CONTRIBUTING.md => CONTRIBUTING.md | 0 src-xmr-btc-swap/Cargo.lock => Cargo.lock | 0 src-xmr-btc-swap/Cargo.toml => Cargo.toml | 0 src-xmr-btc-swap/LICENSE => LICENSE | 0 src-xmr-btc-swap/README.md => README.md | 0 {src-xmr-btc-swap/docs => docs}/README.md | 0 {src-xmr-btc-swap/docs => docs}/asb/README.md | 0 .../cli-asb-components-asb-pub-nodes.puml | 0 .../cli-asb-components-asb-self-hosted.puml | 0 .../asb/diagrams/cli-asb-overview.puml | 0 .../asb/enter-master-private-key.png | Bin .../docs => docs}/asb/import-keystore.png | Bin .../docs => docs}/asb/transactions-tab.png | Bin {src-xmr-btc-swap/docs => docs}/cli/README.md | 0 .../docs => docs}/cli/discover_and_take.sh | 0 src-xmr-btc-swap/dprint.json => dprint.json | 0 .../Cargo.toml | 0 .../src/image.rs | 0 .../src/lib.rs | 0 .../tests/monerod.rs | 0 .../tests/wallet.rs | 0 .../monero-rpc => monero-rpc}/Cargo.toml | 0 .../monero-rpc => monero-rpc}/src/lib.rs | 0 .../monero-rpc => monero-rpc}/src/monerod.rs | 0 .../monero-rpc => monero-rpc}/src/wallet.rs | 0 .../Cargo.toml | 0 .../src/lib.rs | 0 ...rust-toolchain.toml => rust-toolchain.toml | 0 .../src-gui => src-gui}/.gitignore | 0 .../src-gui => src-gui}/README.md | 0 .../src-gui => src-gui}/index.html | 0 .../src-gui => src-gui}/package.json | 0 .../src-gui => src-gui}/public/tauri.svg | 0 .../src-gui => src-gui}/public/vite.svg | 0 .../src/models/apiModel.ts | 0 .../src/models/cliModel.ts | 0 .../src/models/downloaderModel.ts | 0 .../src/models/rpcModel.ts | 0 .../src/models/storeModel.ts | 0 .../src-gui => src-gui}/src/renderer/api.ts | 0 .../src/renderer/components/App.tsx | 0 .../renderer/components/IpcInvokeButton.tsx | 0 .../alert/FundsLeftInWalletAlert.tsx | 0 .../alert/MoneroWalletRpcUpdatingAlert.tsx | 0 .../alert/RemainingFundsWillBeUsedAlert.tsx | 0 .../components/alert/RpcStatusAlert.tsx | 0 .../alert/SwapMightBeCancelledAlert.tsx | 0 .../components/alert/SwapStatusAlert.tsx | 0 .../components/alert/SwapTxLockAlertsBox.tsx | 0 .../components/alert/UnfinishedSwapsAlert.tsx | 0 .../renderer/components/icons/BitcoinIcon.tsx | 0 .../renderer/components/icons/DiscordIcon.tsx | 0 .../components/icons/LinkIconButton.tsx | 0 .../renderer/components/icons/MoneroIcon.tsx | 0 .../src/renderer/components/icons/TorIcon.tsx | 0 .../inputs/BitcoinAddressTextField.tsx | 0 .../inputs/MoneroAddressTextField.tsx | 0 .../components/modal/DialogHeader.tsx | 0 .../components/modal/PaperTextBox.tsx | 0 .../components/modal/SwapSuspendAlert.tsx | 0 .../modal/feedback/FeedbackDialog.tsx | 0 .../modal/listSellers/ListSellersDialog.tsx | 0 .../modal/provider/ProviderInfo.tsx | 0 .../modal/provider/ProviderListDialog.tsx | 0 .../modal/provider/ProviderSelect.tsx | 0 .../modal/provider/ProviderSubmitDialog.tsx | 0 .../components/modal/swap/BitcoinQrCode.tsx | 0 .../modal/swap/BitcoinTransactionInfoBox.tsx | 0 .../swap/CircularProgressWithSubtitle.tsx | 0 .../modal/swap/ClipbiardIconButton.tsx | 0 .../modal/swap/DepositAddressInfoBox.tsx | 0 .../components/modal/swap/InfoBox.tsx | 0 .../modal/swap/MoneroTransactionInfoBox.tsx | 0 .../components/modal/swap/SwapDialog.tsx | 0 .../components/modal/swap/SwapDialogTitle.tsx | 0 .../modal/swap/SwapStateStepper.tsx | 0 .../modal/swap/TransactionInfoBox.tsx | 0 .../components/modal/swap/pages/DebugPage.tsx | 0 .../modal/swap/pages/DebugPageSwitchBadge.tsx | 0 .../modal/swap/pages/FeedbackSubmitBadge.tsx | 0 .../modal/swap/pages/SwapStatePage.tsx | 0 .../modal/swap/pages/TorStatusBadge.tsx | 0 .../swap/pages/done/BitcoinPunishedPage.tsx | 0 .../swap/pages/done/BitcoinRefundedPage.tsx | 0 .../pages/done/XmrRedeemInMempoolPage.tsx | 0 .../exited/ProcessExitedAndNotDonePage.tsx | 0 .../swap/pages/exited/ProcessExitedPage.tsx | 0 .../in_progress/BitcoinCancelledPage.tsx | 0 .../BitcoinLockTxInMempoolPage.tsx | 0 .../pages/in_progress/BitcoinRedeemedPage.tsx | 0 .../pages/in_progress/ReceivedQuotePage.tsx | 0 .../swap/pages/in_progress/StartedPage.tsx | 0 .../in_progress/SyncingMoneroWalletPage.tsx | 0 .../in_progress/XmrLockInMempoolPage.tsx | 0 .../swap/pages/in_progress/XmrLockedPage.tsx | 0 .../swap/pages/init/DepositAmountHelper.tsx | 0 .../init/DownloadingMoneroWalletRpcPage.tsx | 0 .../modal/swap/pages/init/InitPage.tsx | 0 .../modal/swap/pages/init/InitiatedPage.tsx | 0 .../init/WaitingForBitcoinDepositPage.tsx | 0 .../modal/wallet/WithdrawDialog.tsx | 0 .../modal/wallet/WithdrawDialogContent.tsx | 0 .../modal/wallet/WithdrawStatePage.tsx | 0 .../modal/wallet/WithdrawStepper.tsx | 0 .../modal/wallet/pages/AddressInputPage.tsx | 0 .../pages/BitcoinWithdrawTxInMempoolPage.tsx | 0 .../modal/wallet/pages/InitiatedPage.tsx | 0 .../components/navigation/Navigation.tsx | 0 .../navigation/NavigationFooter.tsx | 0 .../navigation/NavigationHeader.tsx | 0 .../navigation/RouteListItemIconButton.tsx | 0 .../navigation/UnfinishedSwapsCountBadge.tsx | 0 .../components/other/ExpandableSearchBox.tsx | 0 .../other/HumanizedBitcoinBlockDuration.tsx | 0 .../components/other/JSONViewTree.tsx | 0 .../components/other/LoadingButton.tsx | 0 .../components/other/RenderedCliLog.tsx | 0 .../other/ScrollablePaperTextBox.tsx | 0 .../src/renderer/components/other/Units.tsx | 0 .../components/pages/help/ContactInfoBox.tsx | 0 .../components/pages/help/DonateInfoBox.tsx | 0 .../components/pages/help/FeedbackInfoBox.tsx | 0 .../components/pages/help/HelpPage.tsx | 0 .../components/pages/help/RpcControlBox.tsx | 0 .../components/pages/help/TorInfoBox.tsx | 0 .../components/pages/history/HistoryPage.tsx | 0 .../pages/history/table/HistoryRow.tsx | 0 .../pages/history/table/HistoryRowActions.tsx | 0 .../history/table/HistoryRowExpanded.tsx | 0 .../pages/history/table/HistoryTable.tsx | 0 .../history/table/SwapLogFileOpenButton.tsx | 0 .../table/SwapMoneroRecoveryButton.tsx | 0 .../components/pages/swap/ApiAlertsBox.tsx | 0 .../components/pages/swap/SwapPage.tsx | 0 .../components/pages/swap/SwapWidget.tsx | 0 .../components/pages/wallet/WalletPage.tsx | 0 .../pages/wallet/WalletRefreshButton.tsx | 0 .../pages/wallet/WithdrawWidget.tsx | 0 .../snackbar/GlobalSnackbarProvider.tsx | 0 .../src/renderer/index.ejs | 0 .../src/renderer/index.tsx | 0 .../src-gui => src-gui}/src/renderer/rpc.ts | 0 .../src/renderer/store/storeRenderer.ts | 0 .../src/store/combinedReducer.ts | 0 .../src-gui => src-gui}/src/store/config.ts | 0 .../src/store/features/alertsSlice.ts | 0 .../src/store/features/providersSlice.ts | 0 .../src/store/features/ratesSlice.ts | 0 .../src/store/features/rpcSlice.ts | 0 .../src/store/features/swapSlice.ts | 0 .../src/store/features/torSlice.ts | 0 .../src-gui => src-gui}/src/store/hooks.ts | 0 .../src/utils/conversionUtils.ts | 0 .../src/utils/cryptoUtils.ts | 0 .../src-gui => src-gui}/src/utils/event.ts | 0 .../src-gui => src-gui}/src/utils/logger.ts | 0 .../src/utils/multiAddrUtils.ts | 0 .../src/utils/parseUtils.ts | 0 .../src/utils/sortUtils.ts | 0 .../src/utils/typescriptUtils.tsx | 0 .../src-gui => src-gui}/src/vite-env.d.ts | 0 .../src-gui => src-gui}/tsconfig.json | 0 .../src-gui => src-gui}/tsconfig.node.json | 0 .../src-gui => src-gui}/vite.config.ts | 0 .../src-gui => src-gui}/yarn.lock | 0 .../src-tauri => src-tauri}/.gitignore | 0 .../src-tauri => src-tauri}/Cargo.lock | 0 .../src-tauri => src-tauri}/Cargo.toml | 0 .../src-tauri => src-tauri}/build.rs | 0 .../capabilities/default.json | 0 .../src-tauri => src-tauri}/icons/128x128.png | Bin .../icons/128x128@2x.png | Bin .../src-tauri => src-tauri}/icons/32x32.png | Bin .../icons/Square107x107Logo.png | Bin .../icons/Square142x142Logo.png | Bin .../icons/Square150x150Logo.png | Bin .../icons/Square284x284Logo.png | Bin .../icons/Square30x30Logo.png | Bin .../icons/Square310x310Logo.png | Bin .../icons/Square44x44Logo.png | Bin .../icons/Square71x71Logo.png | Bin .../icons/Square89x89Logo.png | Bin .../icons/StoreLogo.png | Bin .../src-tauri => src-tauri}/icons/icon.icns | Bin .../src-tauri => src-tauri}/icons/icon.ico | Bin .../src-tauri => src-tauri}/icons/icon.png | Bin .../src-tauri => src-tauri}/src/lib.rs | 0 .../src-tauri => src-tauri}/src/main.rs | 0 .../src-tauri => src-tauri}/tauri.conf.json | 0 src-xmr-btc-swap/.cargo/config.toml | 2 - .../.github/ISSUE_TEMPLATE/bug_report.md | 25 --- src-xmr-btc-swap/.github/dependabot.yml | 22 -- src-xmr-btc-swap/.github/workflows/README.md | 47 ---- .../workflows/build-release-binaries.yml | 124 ----------- src-xmr-btc-swap/.github/workflows/ci.yml | 203 ------------------ .../.github/workflows/create-release.yml | 41 ---- .../.github/workflows/draft-new-release.yml | 74 ------- .../.github/workflows/preview-release.yml | 39 ---- src-xmr-btc-swap/.gitignore | 163 -------------- {src-xmr-btc-swap/swap => swap}/Cargo.toml | 0 {src-xmr-btc-swap/swap => swap}/build.rs | 0 .../20210903050345_create_swaps_table.sql | 0 .../20240615140942_btcpunished_update.sql | 0 ..._create_buffered_transfer_proofs_table.sql | 0 .../proptest-regressions/bitcoin/wallet.txt | 0 .../swap => swap}/sqlite_dev_setup.sh | 0 .../swap => swap}/sqlx-data.json | 0 {src-xmr-btc-swap/swap => swap}/src/api.rs | 0 .../swap => swap}/src/api/request.rs | 0 {src-xmr-btc-swap/swap => swap}/src/asb.rs | 0 .../swap => swap}/src/asb/command.rs | 0 .../swap => swap}/src/asb/config.rs | 0 .../swap => swap}/src/asb/event_loop.rs | 0 .../swap => swap}/src/asb/network.rs | 0 .../swap => swap}/src/asb/rate.rs | 0 .../swap => swap}/src/asb/recovery.rs | 0 .../swap => swap}/src/asb/recovery/cancel.rs | 0 .../swap => swap}/src/asb/recovery/punish.rs | 0 .../swap => swap}/src/asb/recovery/redeem.rs | 0 .../swap => swap}/src/asb/recovery/refund.rs | 0 .../src/asb/recovery/safely_abort.rs | 0 .../swap => swap}/src/asb/tracing.rs | 0 {src-xmr-btc-swap/swap => swap}/src/bin.rs | 0 .../swap => swap}/src/bin/asb.rs | 0 .../swap => swap}/src/bin/kraken_ticker.rs | 0 .../swap => swap}/src/bin/swap.rs | 0 .../swap => swap}/src/bitcoin.rs | 0 .../swap => swap}/src/bitcoin/cancel.rs | 0 .../swap => swap}/src/bitcoin/lock.rs | 0 .../swap => swap}/src/bitcoin/punish.rs | 0 .../swap => swap}/src/bitcoin/redeem.rs | 0 .../swap => swap}/src/bitcoin/refund.rs | 0 .../swap => swap}/src/bitcoin/timelocks.rs | 0 .../swap => swap}/src/bitcoin/wallet.rs | 0 {src-xmr-btc-swap/swap => swap}/src/cli.rs | 0 .../swap => swap}/src/cli/behaviour.rs | 0 .../src/cli/cancel_and_refund.rs | 0 .../swap => swap}/src/cli/command.rs | 0 .../swap => swap}/src/cli/event_loop.rs | 0 .../swap => swap}/src/cli/list_sellers.rs | 0 .../swap => swap}/src/cli/tracing.rs | 0 .../swap => swap}/src/cli/transport.rs | 0 {src-xmr-btc-swap/swap => swap}/src/common.rs | 0 .../swap => swap}/src/database.rs | 0 .../swap => swap}/src/database/alice.rs | 0 .../swap => swap}/src/database/bob.rs | 0 .../swap => swap}/src/database/sqlite.rs | 0 {src-xmr-btc-swap/swap => swap}/src/env.rs | 0 {src-xmr-btc-swap/swap => swap}/src/fs.rs | 0 {src-xmr-btc-swap/swap => swap}/src/kraken.rs | 0 {src-xmr-btc-swap/swap => swap}/src/lib.rs | 0 .../swap => swap}/src/libp2p_ext.rs | 0 {src-xmr-btc-swap/swap => swap}/src/monero.rs | 0 .../swap => swap}/src/monero/wallet.rs | 0 .../swap => swap}/src/monero/wallet_rpc.rs | 0 .../swap => swap}/src/monero_ext.rs | 0 .../swap => swap}/src/network.rs | 0 .../src/network/cbor_request_response.rs | 0 .../cooperative_xmr_redeem_after_punish.rs | 0 .../src/network/encrypted_signature.rs | 0 .../src/network/impl_from_rr_event.rs | 0 .../src/network/json_pull_codec.rs | 0 .../swap => swap}/src/network/quote.rs | 0 .../swap => swap}/src/network/redial.rs | 0 .../swap => swap}/src/network/rendezvous.rs | 0 .../swap => swap}/src/network/swap_setup.rs | 0 .../src/network/swap_setup/alice.rs | 0 .../src/network/swap_setup/bob.rs | 0 .../swap => swap}/src/network/swarm.rs | 0 .../swap => swap}/src/network/test.rs | 0 .../src/network/tor_transport.rs | 0 .../src/network/transfer_proof.rs | 0 .../swap => swap}/src/network/transport.rs | 0 .../swap => swap}/src/proptest.rs | 0 .../swap => swap}/src/protocol.rs | 0 .../swap => swap}/src/protocol/alice.rs | 0 .../swap => swap}/src/protocol/alice/state.rs | 0 .../swap => swap}/src/protocol/alice/swap.rs | 0 .../swap => swap}/src/protocol/bob.rs | 0 .../swap => swap}/src/protocol/bob/state.rs | 0 .../swap => swap}/src/protocol/bob/swap.rs | 0 {src-xmr-btc-swap/swap => swap}/src/rpc.rs | 0 .../swap => swap}/src/rpc/methods.rs | 0 {src-xmr-btc-swap/swap => swap}/src/seed.rs | 0 {src-xmr-btc-swap/swap => swap}/src/tor.rs | 0 .../swap => swap}/src/tracing_ext.rs | 0 swap/tempdb | Bin 0 -> 49152 bytes ..._refund_using_cancel_and_refund_command.rs | 0 ...and_refund_command_timelock_not_expired.rs | 0 ...refund_using_cancel_then_refund_command.rs | 0 .../alice_manually_punishes_after_bob_dead.rs | 0 ...punishes_after_bob_dead_and_bob_cancels.rs | 0 ..._manually_redeems_after_enc_sig_learned.rs | 0 .../alice_punishes_after_restart_bob_dead.rs | 0 ...lice_refunds_after_restart_bob_refunded.rs | 0 {src-xmr-btc-swap/swap => swap}/tests/bdk.sh | 0 ...ncurrent_bobs_after_xmr_lock_proof_sent.rs | 0 ...current_bobs_before_xmr_lock_proof_sent.rs | 0 .../tests/ensure_same_swap_id.rs | 0 .../swap => swap}/tests/happy_path.rs | 0 ...ath_bob_offline_while_alice_redeems_btc.rs | 0 ...ppy_path_restart_alice_after_xmr_locked.rs | 0 ...happy_path_restart_bob_after_xmr_locked.rs | 0 ...appy_path_restart_bob_before_xmr_locked.rs | 0 .../swap => swap}/tests/harness/bitcoind.rs | 0 .../swap => swap}/tests/harness/electrs.rs | 0 .../swap => swap}/tests/harness/mod.rs | 0 .../swap => swap}/tests/punish.rs | 0 {src-xmr-btc-swap/swap => swap}/tests/rpc.rs | 0 .../utils => utils}/gpg_keys/delta1.asc | 0 .../utils => utils}/gpg_keys/readme.md | 0 313 files changed, 1 insertion(+), 740 deletions(-) create mode 100644 .gitignore rename src-xmr-btc-swap/CHANGELOG.md => CHANGELOG.md (100%) rename src-xmr-btc-swap/CONTRIBUTING.md => CONTRIBUTING.md (100%) rename src-xmr-btc-swap/Cargo.lock => Cargo.lock (100%) rename src-xmr-btc-swap/Cargo.toml => Cargo.toml (100%) rename src-xmr-btc-swap/LICENSE => LICENSE (100%) rename src-xmr-btc-swap/README.md => README.md (100%) rename {src-xmr-btc-swap/docs => docs}/README.md (100%) rename {src-xmr-btc-swap/docs => docs}/asb/README.md (100%) rename {src-xmr-btc-swap/docs => docs}/asb/diagrams/cli-asb-components-asb-pub-nodes.puml (100%) rename {src-xmr-btc-swap/docs => docs}/asb/diagrams/cli-asb-components-asb-self-hosted.puml (100%) rename {src-xmr-btc-swap/docs => docs}/asb/diagrams/cli-asb-overview.puml (100%) rename {src-xmr-btc-swap/docs => docs}/asb/enter-master-private-key.png (100%) rename {src-xmr-btc-swap/docs => docs}/asb/import-keystore.png (100%) rename {src-xmr-btc-swap/docs => docs}/asb/transactions-tab.png (100%) rename {src-xmr-btc-swap/docs => docs}/cli/README.md (100%) rename {src-xmr-btc-swap/docs => docs}/cli/discover_and_take.sh (100%) rename src-xmr-btc-swap/dprint.json => dprint.json (100%) rename {src-xmr-btc-swap/monero-harness => monero-harness}/Cargo.toml (100%) rename {src-xmr-btc-swap/monero-harness => monero-harness}/src/image.rs (100%) rename {src-xmr-btc-swap/monero-harness => monero-harness}/src/lib.rs (100%) rename {src-xmr-btc-swap/monero-harness => monero-harness}/tests/monerod.rs (100%) rename {src-xmr-btc-swap/monero-harness => monero-harness}/tests/wallet.rs (100%) rename {src-xmr-btc-swap/monero-rpc => monero-rpc}/Cargo.toml (100%) rename {src-xmr-btc-swap/monero-rpc => monero-rpc}/src/lib.rs (100%) rename {src-xmr-btc-swap/monero-rpc => monero-rpc}/src/monerod.rs (100%) rename {src-xmr-btc-swap/monero-rpc => monero-rpc}/src/wallet.rs (100%) rename {src-xmr-btc-swap/monero-wallet => monero-wallet}/Cargo.toml (100%) rename {src-xmr-btc-swap/monero-wallet => monero-wallet}/src/lib.rs (100%) rename src-xmr-btc-swap/rust-toolchain.toml => rust-toolchain.toml (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/.gitignore (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/README.md (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/index.html (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/package.json (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/public/tauri.svg (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/public/vite.svg (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/models/apiModel.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/models/cliModel.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/models/downloaderModel.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/models/rpcModel.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/models/storeModel.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/api.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/App.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/IpcInvokeButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/FundsLeftInWalletAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/RpcStatusAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/SwapStatusAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/SwapTxLockAlertsBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/alert/UnfinishedSwapsAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/icons/BitcoinIcon.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/icons/DiscordIcon.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/icons/LinkIconButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/icons/MoneroIcon.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/icons/TorIcon.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/inputs/BitcoinAddressTextField.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/inputs/MoneroAddressTextField.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/DialogHeader.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/PaperTextBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/SwapSuspendAlert.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/feedback/FeedbackDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/listSellers/ListSellersDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/provider/ProviderInfo.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/provider/ProviderListDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/provider/ProviderSelect.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/provider/ProviderSubmitDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/BitcoinQrCode.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/BitcoinTransactionInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/CircularProgressWithSubtitle.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/ClipbiardIconButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/InfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/MoneroTransactionInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/SwapDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/SwapDialogTitle.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/SwapStateStepper.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/TransactionInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/DebugPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/SwapStatePage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/exited/ProcessExitedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/BitcoinCancelledPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/BitcoinRedeemedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/ReceivedQuotePage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/StartedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/SyncingMoneroWalletPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/in_progress/XmrLockedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/init/DownloadingMoneroWalletRpcPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/init/InitPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/init/InitiatedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/WithdrawDialog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/WithdrawStatePage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/WithdrawStepper.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/modal/wallet/pages/InitiatedPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/navigation/Navigation.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/navigation/NavigationFooter.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/navigation/NavigationHeader.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/navigation/RouteListItemIconButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/ExpandableSearchBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/HumanizedBitcoinBlockDuration.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/JSONViewTree.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/LoadingButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/RenderedCliLog.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/ScrollablePaperTextBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/other/Units.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/ContactInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/DonateInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/FeedbackInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/HelpPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/RpcControlBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/help/TorInfoBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/HistoryPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/HistoryRow.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/HistoryRowActions.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/HistoryTable.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/swap/ApiAlertsBox.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/swap/SwapPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/swap/SwapWidget.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/wallet/WalletPage.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/wallet/WalletRefreshButton.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/pages/wallet/WithdrawWidget.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/index.ejs (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/index.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/rpc.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/renderer/store/storeRenderer.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/combinedReducer.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/config.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/alertsSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/providersSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/ratesSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/rpcSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/swapSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/features/torSlice.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/store/hooks.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/conversionUtils.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/cryptoUtils.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/event.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/logger.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/multiAddrUtils.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/parseUtils.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/sortUtils.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/utils/typescriptUtils.tsx (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/src/vite-env.d.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/tsconfig.json (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/tsconfig.node.json (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/vite.config.ts (100%) rename {src-xmr-btc-swap/src-gui => src-gui}/yarn.lock (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/.gitignore (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/Cargo.lock (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/Cargo.toml (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/build.rs (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/capabilities/default.json (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/128x128.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/128x128@2x.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/32x32.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square107x107Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square142x142Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square150x150Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square284x284Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square30x30Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square310x310Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square44x44Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square71x71Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/Square89x89Logo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/StoreLogo.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/icon.icns (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/icon.ico (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/icons/icon.png (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/src/lib.rs (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/src/main.rs (100%) rename {src-xmr-btc-swap/src-tauri => src-tauri}/tauri.conf.json (100%) delete mode 100644 src-xmr-btc-swap/.cargo/config.toml delete mode 100644 src-xmr-btc-swap/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 src-xmr-btc-swap/.github/dependabot.yml delete mode 100644 src-xmr-btc-swap/.github/workflows/README.md delete mode 100644 src-xmr-btc-swap/.github/workflows/build-release-binaries.yml delete mode 100644 src-xmr-btc-swap/.github/workflows/ci.yml delete mode 100644 src-xmr-btc-swap/.github/workflows/create-release.yml delete mode 100644 src-xmr-btc-swap/.github/workflows/draft-new-release.yml delete mode 100644 src-xmr-btc-swap/.github/workflows/preview-release.yml delete mode 100644 src-xmr-btc-swap/.gitignore rename {src-xmr-btc-swap/swap => swap}/Cargo.toml (100%) rename {src-xmr-btc-swap/swap => swap}/build.rs (100%) rename {src-xmr-btc-swap/swap => swap}/migrations/20210903050345_create_swaps_table.sql (100%) rename {src-xmr-btc-swap/swap => swap}/migrations/20240615140942_btcpunished_update.sql (100%) rename {src-xmr-btc-swap/swap => swap}/migrations/20240701231624_create_buffered_transfer_proofs_table.sql (100%) rename {src-xmr-btc-swap/swap => swap}/proptest-regressions/bitcoin/wallet.txt (100%) rename {src-xmr-btc-swap/swap => swap}/sqlite_dev_setup.sh (100%) rename {src-xmr-btc-swap/swap => swap}/sqlx-data.json (100%) rename {src-xmr-btc-swap/swap => swap}/src/api.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/api/request.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/command.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/config.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/event_loop.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/network.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/rate.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery/cancel.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery/punish.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery/redeem.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery/refund.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/recovery/safely_abort.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/asb/tracing.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bin.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bin/asb.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bin/kraken_ticker.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bin/swap.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/cancel.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/lock.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/punish.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/redeem.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/refund.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/timelocks.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/bitcoin/wallet.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/behaviour.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/cancel_and_refund.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/command.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/event_loop.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/list_sellers.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/tracing.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/cli/transport.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/common.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/database.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/database/alice.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/database/bob.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/database/sqlite.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/env.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/fs.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/kraken.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/lib.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/libp2p_ext.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/monero.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/monero/wallet.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/monero/wallet_rpc.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/monero_ext.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/cbor_request_response.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/cooperative_xmr_redeem_after_punish.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/encrypted_signature.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/impl_from_rr_event.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/json_pull_codec.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/quote.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/redial.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/rendezvous.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/swap_setup.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/swap_setup/alice.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/swap_setup/bob.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/swarm.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/test.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/tor_transport.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/transfer_proof.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/network/transport.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/proptest.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/alice.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/alice/state.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/alice/swap.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/bob.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/bob/state.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/protocol/bob/swap.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/rpc.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/rpc/methods.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/seed.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/tor.rs (100%) rename {src-xmr-btc-swap/swap => swap}/src/tracing_ext.rs (100%) create mode 100644 swap/tempdb rename {src-xmr-btc-swap/swap => swap}/tests/alice_and_bob_refund_using_cancel_and_refund_command.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_and_bob_refund_using_cancel_then_refund_command.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_manually_punishes_after_bob_dead.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_manually_redeems_after_enc_sig_learned.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_punishes_after_restart_bob_dead.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/alice_refunds_after_restart_bob_refunded.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/bdk.sh (100%) rename {src-xmr-btc-swap/swap => swap}/tests/concurrent_bobs_after_xmr_lock_proof_sent.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/concurrent_bobs_before_xmr_lock_proof_sent.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/ensure_same_swap_id.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/happy_path.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/happy_path_bob_offline_while_alice_redeems_btc.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/happy_path_restart_alice_after_xmr_locked.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/happy_path_restart_bob_after_xmr_locked.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/happy_path_restart_bob_before_xmr_locked.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/harness/bitcoind.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/harness/electrs.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/harness/mod.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/punish.rs (100%) rename {src-xmr-btc-swap/swap => swap}/tests/rpc.rs (100%) rename {src-xmr-btc-swap/utils => utils}/gpg_keys/delta1.asc (100%) rename {src-xmr-btc-swap/utils => utils}/gpg_keys/readme.md (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..eb5a316c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target diff --git a/src-xmr-btc-swap/CHANGELOG.md b/CHANGELOG.md similarity index 100% rename from src-xmr-btc-swap/CHANGELOG.md rename to CHANGELOG.md diff --git a/src-xmr-btc-swap/CONTRIBUTING.md b/CONTRIBUTING.md similarity index 100% rename from src-xmr-btc-swap/CONTRIBUTING.md rename to CONTRIBUTING.md diff --git a/src-xmr-btc-swap/Cargo.lock b/Cargo.lock similarity index 100% rename from src-xmr-btc-swap/Cargo.lock rename to Cargo.lock diff --git a/src-xmr-btc-swap/Cargo.toml b/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/Cargo.toml rename to Cargo.toml diff --git a/src-xmr-btc-swap/LICENSE b/LICENSE similarity index 100% rename from src-xmr-btc-swap/LICENSE rename to LICENSE diff --git a/src-xmr-btc-swap/README.md b/README.md similarity index 100% rename from src-xmr-btc-swap/README.md rename to README.md diff --git a/src-xmr-btc-swap/docs/README.md b/docs/README.md similarity index 100% rename from src-xmr-btc-swap/docs/README.md rename to docs/README.md diff --git a/src-xmr-btc-swap/docs/asb/README.md b/docs/asb/README.md similarity index 100% rename from src-xmr-btc-swap/docs/asb/README.md rename to docs/asb/README.md diff --git a/src-xmr-btc-swap/docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml b/docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml similarity index 100% rename from src-xmr-btc-swap/docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml rename to docs/asb/diagrams/cli-asb-components-asb-pub-nodes.puml diff --git a/src-xmr-btc-swap/docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml b/docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml similarity index 100% rename from src-xmr-btc-swap/docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml rename to docs/asb/diagrams/cli-asb-components-asb-self-hosted.puml diff --git a/src-xmr-btc-swap/docs/asb/diagrams/cli-asb-overview.puml b/docs/asb/diagrams/cli-asb-overview.puml similarity index 100% rename from src-xmr-btc-swap/docs/asb/diagrams/cli-asb-overview.puml rename to docs/asb/diagrams/cli-asb-overview.puml diff --git a/src-xmr-btc-swap/docs/asb/enter-master-private-key.png b/docs/asb/enter-master-private-key.png similarity index 100% rename from src-xmr-btc-swap/docs/asb/enter-master-private-key.png rename to docs/asb/enter-master-private-key.png diff --git a/src-xmr-btc-swap/docs/asb/import-keystore.png b/docs/asb/import-keystore.png similarity index 100% rename from src-xmr-btc-swap/docs/asb/import-keystore.png rename to docs/asb/import-keystore.png diff --git a/src-xmr-btc-swap/docs/asb/transactions-tab.png b/docs/asb/transactions-tab.png similarity index 100% rename from src-xmr-btc-swap/docs/asb/transactions-tab.png rename to docs/asb/transactions-tab.png diff --git a/src-xmr-btc-swap/docs/cli/README.md b/docs/cli/README.md similarity index 100% rename from src-xmr-btc-swap/docs/cli/README.md rename to docs/cli/README.md diff --git a/src-xmr-btc-swap/docs/cli/discover_and_take.sh b/docs/cli/discover_and_take.sh similarity index 100% rename from src-xmr-btc-swap/docs/cli/discover_and_take.sh rename to docs/cli/discover_and_take.sh diff --git a/src-xmr-btc-swap/dprint.json b/dprint.json similarity index 100% rename from src-xmr-btc-swap/dprint.json rename to dprint.json diff --git a/src-xmr-btc-swap/monero-harness/Cargo.toml b/monero-harness/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/monero-harness/Cargo.toml rename to monero-harness/Cargo.toml diff --git a/src-xmr-btc-swap/monero-harness/src/image.rs b/monero-harness/src/image.rs similarity index 100% rename from src-xmr-btc-swap/monero-harness/src/image.rs rename to monero-harness/src/image.rs diff --git a/src-xmr-btc-swap/monero-harness/src/lib.rs b/monero-harness/src/lib.rs similarity index 100% rename from src-xmr-btc-swap/monero-harness/src/lib.rs rename to monero-harness/src/lib.rs diff --git a/src-xmr-btc-swap/monero-harness/tests/monerod.rs b/monero-harness/tests/monerod.rs similarity index 100% rename from src-xmr-btc-swap/monero-harness/tests/monerod.rs rename to monero-harness/tests/monerod.rs diff --git a/src-xmr-btc-swap/monero-harness/tests/wallet.rs b/monero-harness/tests/wallet.rs similarity index 100% rename from src-xmr-btc-swap/monero-harness/tests/wallet.rs rename to monero-harness/tests/wallet.rs diff --git a/src-xmr-btc-swap/monero-rpc/Cargo.toml b/monero-rpc/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/monero-rpc/Cargo.toml rename to monero-rpc/Cargo.toml diff --git a/src-xmr-btc-swap/monero-rpc/src/lib.rs b/monero-rpc/src/lib.rs similarity index 100% rename from src-xmr-btc-swap/monero-rpc/src/lib.rs rename to monero-rpc/src/lib.rs diff --git a/src-xmr-btc-swap/monero-rpc/src/monerod.rs b/monero-rpc/src/monerod.rs similarity index 100% rename from src-xmr-btc-swap/monero-rpc/src/monerod.rs rename to monero-rpc/src/monerod.rs diff --git a/src-xmr-btc-swap/monero-rpc/src/wallet.rs b/monero-rpc/src/wallet.rs similarity index 100% rename from src-xmr-btc-swap/monero-rpc/src/wallet.rs rename to monero-rpc/src/wallet.rs diff --git a/src-xmr-btc-swap/monero-wallet/Cargo.toml b/monero-wallet/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/monero-wallet/Cargo.toml rename to monero-wallet/Cargo.toml diff --git a/src-xmr-btc-swap/monero-wallet/src/lib.rs b/monero-wallet/src/lib.rs similarity index 100% rename from src-xmr-btc-swap/monero-wallet/src/lib.rs rename to monero-wallet/src/lib.rs diff --git a/src-xmr-btc-swap/rust-toolchain.toml b/rust-toolchain.toml similarity index 100% rename from src-xmr-btc-swap/rust-toolchain.toml rename to rust-toolchain.toml diff --git a/src-xmr-btc-swap/src-gui/.gitignore b/src-gui/.gitignore similarity index 100% rename from src-xmr-btc-swap/src-gui/.gitignore rename to src-gui/.gitignore diff --git a/src-xmr-btc-swap/src-gui/README.md b/src-gui/README.md similarity index 100% rename from src-xmr-btc-swap/src-gui/README.md rename to src-gui/README.md diff --git a/src-xmr-btc-swap/src-gui/index.html b/src-gui/index.html similarity index 100% rename from src-xmr-btc-swap/src-gui/index.html rename to src-gui/index.html diff --git a/src-xmr-btc-swap/src-gui/package.json b/src-gui/package.json similarity index 100% rename from src-xmr-btc-swap/src-gui/package.json rename to src-gui/package.json diff --git a/src-xmr-btc-swap/src-gui/public/tauri.svg b/src-gui/public/tauri.svg similarity index 100% rename from src-xmr-btc-swap/src-gui/public/tauri.svg rename to src-gui/public/tauri.svg diff --git a/src-xmr-btc-swap/src-gui/public/vite.svg b/src-gui/public/vite.svg similarity index 100% rename from src-xmr-btc-swap/src-gui/public/vite.svg rename to src-gui/public/vite.svg diff --git a/src-xmr-btc-swap/src-gui/src/models/apiModel.ts b/src-gui/src/models/apiModel.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/models/apiModel.ts rename to src-gui/src/models/apiModel.ts diff --git a/src-xmr-btc-swap/src-gui/src/models/cliModel.ts b/src-gui/src/models/cliModel.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/models/cliModel.ts rename to src-gui/src/models/cliModel.ts diff --git a/src-xmr-btc-swap/src-gui/src/models/downloaderModel.ts b/src-gui/src/models/downloaderModel.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/models/downloaderModel.ts rename to src-gui/src/models/downloaderModel.ts diff --git a/src-xmr-btc-swap/src-gui/src/models/rpcModel.ts b/src-gui/src/models/rpcModel.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/models/rpcModel.ts rename to src-gui/src/models/rpcModel.ts diff --git a/src-xmr-btc-swap/src-gui/src/models/storeModel.ts b/src-gui/src/models/storeModel.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/models/storeModel.ts rename to src-gui/src/models/storeModel.ts diff --git a/src-xmr-btc-swap/src-gui/src/renderer/api.ts b/src-gui/src/renderer/api.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/api.ts rename to src-gui/src/renderer/api.ts diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/App.tsx b/src-gui/src/renderer/components/App.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/App.tsx rename to src-gui/src/renderer/components/App.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/IpcInvokeButton.tsx b/src-gui/src/renderer/components/IpcInvokeButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/IpcInvokeButton.tsx rename to src-gui/src/renderer/components/IpcInvokeButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx b/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx rename to src-gui/src/renderer/components/alert/FundsLeftInWalletAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx b/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx rename to src-gui/src/renderer/components/alert/MoneroWalletRpcUpdatingAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx b/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx rename to src-gui/src/renderer/components/alert/RemainingFundsWillBeUsedAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx b/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/RpcStatusAlert.tsx rename to src-gui/src/renderer/components/alert/RpcStatusAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx b/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx rename to src-gui/src/renderer/components/alert/SwapMightBeCancelledAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx b/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapStatusAlert.tsx rename to src-gui/src/renderer/components/alert/SwapStatusAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx b/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx rename to src-gui/src/renderer/components/alert/SwapTxLockAlertsBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx b/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx rename to src-gui/src/renderer/components/alert/UnfinishedSwapsAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/icons/BitcoinIcon.tsx b/src-gui/src/renderer/components/icons/BitcoinIcon.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/icons/BitcoinIcon.tsx rename to src-gui/src/renderer/components/icons/BitcoinIcon.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/icons/DiscordIcon.tsx b/src-gui/src/renderer/components/icons/DiscordIcon.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/icons/DiscordIcon.tsx rename to src-gui/src/renderer/components/icons/DiscordIcon.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/icons/LinkIconButton.tsx b/src-gui/src/renderer/components/icons/LinkIconButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/icons/LinkIconButton.tsx rename to src-gui/src/renderer/components/icons/LinkIconButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/icons/MoneroIcon.tsx b/src-gui/src/renderer/components/icons/MoneroIcon.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/icons/MoneroIcon.tsx rename to src-gui/src/renderer/components/icons/MoneroIcon.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/icons/TorIcon.tsx b/src-gui/src/renderer/components/icons/TorIcon.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/icons/TorIcon.tsx rename to src-gui/src/renderer/components/icons/TorIcon.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx b/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx rename to src-gui/src/renderer/components/inputs/BitcoinAddressTextField.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx b/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx rename to src-gui/src/renderer/components/inputs/MoneroAddressTextField.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/DialogHeader.tsx b/src-gui/src/renderer/components/modal/DialogHeader.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/DialogHeader.tsx rename to src-gui/src/renderer/components/modal/DialogHeader.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/PaperTextBox.tsx b/src-gui/src/renderer/components/modal/PaperTextBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/PaperTextBox.tsx rename to src-gui/src/renderer/components/modal/PaperTextBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx b/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx rename to src-gui/src/renderer/components/modal/SwapSuspendAlert.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx b/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx rename to src-gui/src/renderer/components/modal/feedback/FeedbackDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx b/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx rename to src-gui/src/renderer/components/modal/listSellers/ListSellersDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderInfo.tsx b/src-gui/src/renderer/components/modal/provider/ProviderInfo.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderInfo.tsx rename to src-gui/src/renderer/components/modal/provider/ProviderInfo.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderListDialog.tsx b/src-gui/src/renderer/components/modal/provider/ProviderListDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderListDialog.tsx rename to src-gui/src/renderer/components/modal/provider/ProviderListDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderSelect.tsx b/src-gui/src/renderer/components/modal/provider/ProviderSelect.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderSelect.tsx rename to src-gui/src/renderer/components/modal/provider/ProviderSelect.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderSubmitDialog.tsx b/src-gui/src/renderer/components/modal/provider/ProviderSubmitDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/provider/ProviderSubmitDialog.tsx rename to src-gui/src/renderer/components/modal/provider/ProviderSubmitDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/BitcoinQrCode.tsx b/src-gui/src/renderer/components/modal/swap/BitcoinQrCode.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/BitcoinQrCode.tsx rename to src-gui/src/renderer/components/modal/swap/BitcoinQrCode.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/BitcoinTransactionInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/BitcoinTransactionInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/BitcoinTransactionInfoBox.tsx rename to src-gui/src/renderer/components/modal/swap/BitcoinTransactionInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/CircularProgressWithSubtitle.tsx b/src-gui/src/renderer/components/modal/swap/CircularProgressWithSubtitle.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/CircularProgressWithSubtitle.tsx rename to src-gui/src/renderer/components/modal/swap/CircularProgressWithSubtitle.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx b/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx rename to src-gui/src/renderer/components/modal/swap/ClipbiardIconButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx rename to src-gui/src/renderer/components/modal/swap/DepositAddressInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/InfoBox.tsx b/src-gui/src/renderer/components/modal/swap/InfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/InfoBox.tsx rename to src-gui/src/renderer/components/modal/swap/InfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/MoneroTransactionInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/MoneroTransactionInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/MoneroTransactionInfoBox.tsx rename to src-gui/src/renderer/components/modal/swap/MoneroTransactionInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx b/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapDialog.tsx rename to src-gui/src/renderer/components/modal/swap/SwapDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx b/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx rename to src-gui/src/renderer/components/modal/swap/SwapDialogTitle.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx b/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx rename to src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx b/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx rename to src-gui/src/renderer/components/modal/swap/TransactionInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/DebugPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx rename to src-gui/src/renderer/components/modal/swap/pages/DebugPageSwitchBadge.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx rename to src-gui/src/renderer/components/modal/swap/pages/FeedbackSubmitBadge.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx b/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/SwapStatePage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx b/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx rename to src-gui/src/renderer/components/modal/swap/pages/TorStatusBadge.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/done/BitcoinPunishedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/done/BitcoinRefundedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/done/XmrRedeemInMempoolPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx b/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedAndNotDonePage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/exited/ProcessExitedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinCancelledPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinCancelledPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinCancelledPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinCancelledPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinLockTxInMempoolPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinRedeemedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinRedeemedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinRedeemedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/BitcoinRedeemedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/ReceivedQuotePage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/ReceivedQuotePage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/ReceivedQuotePage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/ReceivedQuotePage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/StartedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/StartedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/StartedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/StartedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/SyncingMoneroWalletPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/SyncingMoneroWalletPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/SyncingMoneroWalletPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/SyncingMoneroWalletPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockInMempoolPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/in_progress/XmrLockedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx rename to src-gui/src/renderer/components/modal/swap/pages/init/DepositAmountHelper.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/DownloadingMoneroWalletRpcPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/DownloadingMoneroWalletRpcPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/DownloadingMoneroWalletRpcPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/init/DownloadingMoneroWalletRpcPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/init/InitPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/InitiatedPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/InitiatedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/InitiatedPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/init/InitiatedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx b/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx rename to src-gui/src/renderer/components/modal/swap/pages/init/WaitingForBitcoinDepositPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx rename to src-gui/src/renderer/components/modal/wallet/WithdrawDialog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx rename to src-gui/src/renderer/components/modal/wallet/WithdrawDialogContent.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawStatePage.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawStatePage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawStatePage.tsx rename to src-gui/src/renderer/components/modal/wallet/WithdrawStatePage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx b/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx rename to src-gui/src/renderer/components/modal/wallet/WithdrawStepper.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx b/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx rename to src-gui/src/renderer/components/modal/wallet/pages/AddressInputPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx b/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx rename to src-gui/src/renderer/components/modal/wallet/pages/BitcoinWithdrawTxInMempoolPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/InitiatedPage.tsx b/src-gui/src/renderer/components/modal/wallet/pages/InitiatedPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/modal/wallet/pages/InitiatedPage.tsx rename to src-gui/src/renderer/components/modal/wallet/pages/InitiatedPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/navigation/Navigation.tsx b/src-gui/src/renderer/components/navigation/Navigation.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/navigation/Navigation.tsx rename to src-gui/src/renderer/components/navigation/Navigation.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/navigation/NavigationFooter.tsx b/src-gui/src/renderer/components/navigation/NavigationFooter.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/navigation/NavigationFooter.tsx rename to src-gui/src/renderer/components/navigation/NavigationFooter.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/navigation/NavigationHeader.tsx b/src-gui/src/renderer/components/navigation/NavigationHeader.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/navigation/NavigationHeader.tsx rename to src-gui/src/renderer/components/navigation/NavigationHeader.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx b/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx rename to src-gui/src/renderer/components/navigation/RouteListItemIconButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx b/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx rename to src-gui/src/renderer/components/navigation/UnfinishedSwapsCountBadge.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx b/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/ExpandableSearchBox.tsx rename to src-gui/src/renderer/components/other/ExpandableSearchBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/HumanizedBitcoinBlockDuration.tsx b/src-gui/src/renderer/components/other/HumanizedBitcoinBlockDuration.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/HumanizedBitcoinBlockDuration.tsx rename to src-gui/src/renderer/components/other/HumanizedBitcoinBlockDuration.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/JSONViewTree.tsx b/src-gui/src/renderer/components/other/JSONViewTree.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/JSONViewTree.tsx rename to src-gui/src/renderer/components/other/JSONViewTree.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/LoadingButton.tsx b/src-gui/src/renderer/components/other/LoadingButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/LoadingButton.tsx rename to src-gui/src/renderer/components/other/LoadingButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/RenderedCliLog.tsx b/src-gui/src/renderer/components/other/RenderedCliLog.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/RenderedCliLog.tsx rename to src-gui/src/renderer/components/other/RenderedCliLog.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx b/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx rename to src-gui/src/renderer/components/other/ScrollablePaperTextBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/other/Units.tsx b/src-gui/src/renderer/components/other/Units.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/other/Units.tsx rename to src-gui/src/renderer/components/other/Units.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx b/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx rename to src-gui/src/renderer/components/pages/help/ContactInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx b/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx rename to src-gui/src/renderer/components/pages/help/DonateInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx b/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx rename to src-gui/src/renderer/components/pages/help/FeedbackInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/HelpPage.tsx b/src-gui/src/renderer/components/pages/help/HelpPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/HelpPage.tsx rename to src-gui/src/renderer/components/pages/help/HelpPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx b/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/RpcControlBox.tsx rename to src-gui/src/renderer/components/pages/help/RpcControlBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx b/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/help/TorInfoBox.tsx rename to src-gui/src/renderer/components/pages/help/TorInfoBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/HistoryPage.tsx b/src-gui/src/renderer/components/pages/history/HistoryPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/HistoryPage.tsx rename to src-gui/src/renderer/components/pages/history/HistoryPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx rename to src-gui/src/renderer/components/pages/history/table/HistoryRow.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx rename to src-gui/src/renderer/components/pages/history/table/HistoryRowActions.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx rename to src-gui/src/renderer/components/pages/history/table/HistoryRowExpanded.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx b/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx rename to src-gui/src/renderer/components/pages/history/table/HistoryTable.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx b/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx rename to src-gui/src/renderer/components/pages/history/table/SwapLogFileOpenButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx b/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx rename to src-gui/src/renderer/components/pages/history/table/SwapMoneroRecoveryButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx b/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx rename to src-gui/src/renderer/components/pages/swap/ApiAlertsBox.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/SwapPage.tsx b/src-gui/src/renderer/components/pages/swap/SwapPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/SwapPage.tsx rename to src-gui/src/renderer/components/pages/swap/SwapPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx b/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/swap/SwapWidget.tsx rename to src-gui/src/renderer/components/pages/swap/SwapWidget.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx b/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WalletPage.tsx rename to src-gui/src/renderer/components/pages/wallet/WalletPage.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx b/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx rename to src-gui/src/renderer/components/pages/wallet/WalletRefreshButton.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx b/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx rename to src-gui/src/renderer/components/pages/wallet/WithdrawWidget.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx b/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx rename to src-gui/src/renderer/components/snackbar/GlobalSnackbarProvider.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/index.ejs b/src-gui/src/renderer/index.ejs similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/index.ejs rename to src-gui/src/renderer/index.ejs diff --git a/src-xmr-btc-swap/src-gui/src/renderer/index.tsx b/src-gui/src/renderer/index.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/index.tsx rename to src-gui/src/renderer/index.tsx diff --git a/src-xmr-btc-swap/src-gui/src/renderer/rpc.ts b/src-gui/src/renderer/rpc.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/rpc.ts rename to src-gui/src/renderer/rpc.ts diff --git a/src-xmr-btc-swap/src-gui/src/renderer/store/storeRenderer.ts b/src-gui/src/renderer/store/storeRenderer.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/renderer/store/storeRenderer.ts rename to src-gui/src/renderer/store/storeRenderer.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/combinedReducer.ts b/src-gui/src/store/combinedReducer.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/combinedReducer.ts rename to src-gui/src/store/combinedReducer.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/config.ts b/src-gui/src/store/config.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/config.ts rename to src-gui/src/store/config.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/alertsSlice.ts b/src-gui/src/store/features/alertsSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/alertsSlice.ts rename to src-gui/src/store/features/alertsSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/providersSlice.ts b/src-gui/src/store/features/providersSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/providersSlice.ts rename to src-gui/src/store/features/providersSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/ratesSlice.ts b/src-gui/src/store/features/ratesSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/ratesSlice.ts rename to src-gui/src/store/features/ratesSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/rpcSlice.ts b/src-gui/src/store/features/rpcSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/rpcSlice.ts rename to src-gui/src/store/features/rpcSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/swapSlice.ts b/src-gui/src/store/features/swapSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/swapSlice.ts rename to src-gui/src/store/features/swapSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/features/torSlice.ts b/src-gui/src/store/features/torSlice.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/features/torSlice.ts rename to src-gui/src/store/features/torSlice.ts diff --git a/src-xmr-btc-swap/src-gui/src/store/hooks.ts b/src-gui/src/store/hooks.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/store/hooks.ts rename to src-gui/src/store/hooks.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/conversionUtils.ts b/src-gui/src/utils/conversionUtils.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/conversionUtils.ts rename to src-gui/src/utils/conversionUtils.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/cryptoUtils.ts b/src-gui/src/utils/cryptoUtils.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/cryptoUtils.ts rename to src-gui/src/utils/cryptoUtils.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/event.ts b/src-gui/src/utils/event.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/event.ts rename to src-gui/src/utils/event.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/logger.ts b/src-gui/src/utils/logger.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/logger.ts rename to src-gui/src/utils/logger.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/multiAddrUtils.ts b/src-gui/src/utils/multiAddrUtils.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/multiAddrUtils.ts rename to src-gui/src/utils/multiAddrUtils.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/parseUtils.ts b/src-gui/src/utils/parseUtils.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/parseUtils.ts rename to src-gui/src/utils/parseUtils.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/sortUtils.ts b/src-gui/src/utils/sortUtils.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/sortUtils.ts rename to src-gui/src/utils/sortUtils.ts diff --git a/src-xmr-btc-swap/src-gui/src/utils/typescriptUtils.tsx b/src-gui/src/utils/typescriptUtils.tsx similarity index 100% rename from src-xmr-btc-swap/src-gui/src/utils/typescriptUtils.tsx rename to src-gui/src/utils/typescriptUtils.tsx diff --git a/src-xmr-btc-swap/src-gui/src/vite-env.d.ts b/src-gui/src/vite-env.d.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/src/vite-env.d.ts rename to src-gui/src/vite-env.d.ts diff --git a/src-xmr-btc-swap/src-gui/tsconfig.json b/src-gui/tsconfig.json similarity index 100% rename from src-xmr-btc-swap/src-gui/tsconfig.json rename to src-gui/tsconfig.json diff --git a/src-xmr-btc-swap/src-gui/tsconfig.node.json b/src-gui/tsconfig.node.json similarity index 100% rename from src-xmr-btc-swap/src-gui/tsconfig.node.json rename to src-gui/tsconfig.node.json diff --git a/src-xmr-btc-swap/src-gui/vite.config.ts b/src-gui/vite.config.ts similarity index 100% rename from src-xmr-btc-swap/src-gui/vite.config.ts rename to src-gui/vite.config.ts diff --git a/src-xmr-btc-swap/src-gui/yarn.lock b/src-gui/yarn.lock similarity index 100% rename from src-xmr-btc-swap/src-gui/yarn.lock rename to src-gui/yarn.lock diff --git a/src-xmr-btc-swap/src-tauri/.gitignore b/src-tauri/.gitignore similarity index 100% rename from src-xmr-btc-swap/src-tauri/.gitignore rename to src-tauri/.gitignore diff --git a/src-xmr-btc-swap/src-tauri/Cargo.lock b/src-tauri/Cargo.lock similarity index 100% rename from src-xmr-btc-swap/src-tauri/Cargo.lock rename to src-tauri/Cargo.lock diff --git a/src-xmr-btc-swap/src-tauri/Cargo.toml b/src-tauri/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/src-tauri/Cargo.toml rename to src-tauri/Cargo.toml diff --git a/src-xmr-btc-swap/src-tauri/build.rs b/src-tauri/build.rs similarity index 100% rename from src-xmr-btc-swap/src-tauri/build.rs rename to src-tauri/build.rs diff --git a/src-xmr-btc-swap/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json similarity index 100% rename from src-xmr-btc-swap/src-tauri/capabilities/default.json rename to src-tauri/capabilities/default.json diff --git a/src-xmr-btc-swap/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/128x128.png rename to src-tauri/icons/128x128.png diff --git a/src-xmr-btc-swap/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/128x128@2x.png rename to src-tauri/icons/128x128@2x.png diff --git a/src-xmr-btc-swap/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/32x32.png rename to src-tauri/icons/32x32.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square107x107Logo.png rename to src-tauri/icons/Square107x107Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square142x142Logo.png rename to src-tauri/icons/Square142x142Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square150x150Logo.png rename to src-tauri/icons/Square150x150Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square284x284Logo.png rename to src-tauri/icons/Square284x284Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square30x30Logo.png rename to src-tauri/icons/Square30x30Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square310x310Logo.png rename to src-tauri/icons/Square310x310Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square44x44Logo.png rename to src-tauri/icons/Square44x44Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square71x71Logo.png rename to src-tauri/icons/Square71x71Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/Square89x89Logo.png rename to src-tauri/icons/Square89x89Logo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/StoreLogo.png rename to src-tauri/icons/StoreLogo.png diff --git a/src-xmr-btc-swap/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/icon.icns rename to src-tauri/icons/icon.icns diff --git a/src-xmr-btc-swap/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/icon.ico rename to src-tauri/icons/icon.ico diff --git a/src-xmr-btc-swap/src-tauri/icons/icon.png b/src-tauri/icons/icon.png similarity index 100% rename from src-xmr-btc-swap/src-tauri/icons/icon.png rename to src-tauri/icons/icon.png diff --git a/src-xmr-btc-swap/src-tauri/src/lib.rs b/src-tauri/src/lib.rs similarity index 100% rename from src-xmr-btc-swap/src-tauri/src/lib.rs rename to src-tauri/src/lib.rs diff --git a/src-xmr-btc-swap/src-tauri/src/main.rs b/src-tauri/src/main.rs similarity index 100% rename from src-xmr-btc-swap/src-tauri/src/main.rs rename to src-tauri/src/main.rs diff --git a/src-xmr-btc-swap/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json similarity index 100% rename from src-xmr-btc-swap/src-tauri/tauri.conf.json rename to src-tauri/tauri.conf.json diff --git a/src-xmr-btc-swap/.cargo/config.toml b/src-xmr-btc-swap/.cargo/config.toml deleted file mode 100644 index 0c1c209f..00000000 --- a/src-xmr-btc-swap/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.armv7-unknown-linux-gnueabihf] -linker = "arm-linux-gnueabihf-gcc" diff --git a/src-xmr-btc-swap/.github/ISSUE_TEMPLATE/bug_report.md b/src-xmr-btc-swap/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index a69c2914..00000000 --- a/src-xmr-btc-swap/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**Lost/trapped Funds** -Yes or No - -**Debug logs** -Please post your debug logs. You find them in: -Linux: /home//.local/share/xmr-btc-swap/logs -OSX: /Users//Library/ApplicationSupport/xmr-btc-swap/logs - -**Platform (please complete the following information):** - -- CLI or ASB [eg. CLI] -- Software Version [e.g. 0.8.3] -- Operating System: [e.g. Ubuntu] diff --git a/src-xmr-btc-swap/.github/dependabot.yml b/src-xmr-btc-swap/.github/dependabot.yml deleted file mode 100644 index b04d9707..00000000 --- a/src-xmr-btc-swap/.github/dependabot.yml +++ /dev/null @@ -1,22 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "cargo" - directory: "/" - schedule: - interval: "daily" - rebase-strategy: "disabled" - open-pull-requests-limit: 10 - ignore: - - dependency-name: "bitcoin" # Needs to be updated together with bdk to be in sync. - - dependency-name: "miniscript" # Needs to be updated together with bdk to be in sync. - - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - rebase-strategy: "disabled" diff --git a/src-xmr-btc-swap/.github/workflows/README.md b/src-xmr-btc-swap/.github/workflows/README.md deleted file mode 100644 index d9342ba3..00000000 --- a/src-xmr-btc-swap/.github/workflows/README.md +++ /dev/null @@ -1,47 +0,0 @@ -# Workflow documentation - -## `ci.yml` - -Defines the Continuous Integration workflow for merging into the `master` branch. - -## Releases - -The workflows in this repository automate various things around releases. -The functionality is composed in such a way that a human can easily start the workflow at various points, i.e. instead of being an all-or-nothing automation, we can step in where necessary. - -### Preview release - -We have a rolling tag `preview` that always points to HEAD of `master`. -The [preview-release.yml](./preview-release.yml) workflow moves this tag to latest HEAD every time a PR gets merged. -It also creates a corresponding GitHub "pre-release". - -### Building release binaries and attaching changelog - -Whenever a new release is created, the [build-release-binaries.yml](build-release-binaries.yml) workflow will build the `swap` and `asb` binaries in release mode and attach them to the release as artifacts. - -Because this workflow is triggered on every release, it works for: - -- automatically created `preview` releases -- releases created through the GitHub web interface -- releases created by merging release branches into `master` - -### Making a new release - -To create a new release, one has to: - -- Create a new branch -- Update the version in the [swap/Cargo.toml](../../swap/Cargo.toml) manifest file -- Update the Changelog (convert `Unreleased` section to a release) -- Make a commit -- Open and merge a PR -- Create a release from the resulting merge commit - -To avoid errors in this process, we can automate it. -The [draft-new-release.yml](./draft-new-release.yml) workflow allows the user specify the desired version and the workflow will then open a PR that automates the above. - -The created branch will follow the naming of `release/X.Y.Z` for the given version. - -Any time a PR with such a branch name is merged, the [create-release.yml](./create-release.yml) workflow kicks in and creates a new release based on the resulting merge commit. - -Because these two workflows are de-coupled, a user is free to create a release branch themselves if they wish to do so. -They may also side-step both of these workflows by creating a release manually using the Github web interface. diff --git a/src-xmr-btc-swap/.github/workflows/build-release-binaries.yml b/src-xmr-btc-swap/.github/workflows/build-release-binaries.yml deleted file mode 100644 index 662e3a5e..00000000 --- a/src-xmr-btc-swap/.github/workflows/build-release-binaries.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: "Build swap and asb release binaries" - -on: - release: - types: [created] - -jobs: - build_binaries: - name: Build - strategy: - fail-fast: false - matrix: - include: - - bin: swap - target: x86_64-unknown-linux-gnu - os: ubuntu-latest - archive_ext: tar - - bin: swap - target: armv7-unknown-linux-gnueabihf - os: ubuntu-latest - archive_ext: tar - - bin: swap - target: x86_64-apple-darwin - os: macos-12 - archive_ext: tar - - bin: swap - target: aarch64-apple-darwin - os: macos-latest - archive_ext: tar - - bin: swap - target: x86_64-pc-windows-msvc - os: windows-latest - archive_ext: zip - - bin: asb - target: x86_64-unknown-linux-gnu - os: ubuntu-latest - archive_ext: tar - - bin: asb - target: armv7-unknown-linux-gnueabihf - os: ubuntu-latest - archive_ext: tar - - bin: asb - target: x86_64-apple-darwin - os: macos-12 - archive_ext: tar - - bin: asb - target: aarch64-apple-darwin - os: macos-latest - archive_ext: tar - - bin: asb - target: x86_64-pc-windows-msvc - os: windows-latest - archive_ext: zip - runs-on: ${{ matrix.os }} - steps: - - name: Checkout tagged commit - uses: actions/checkout@v4.1.7 - with: - ref: ${{ github.event.release.target_commitish }} - token: ${{ secrets.BOTTY_GITHUB_TOKEN }} - - - uses: Swatinem/rust-cache@v2.7.3 - - - uses: dtolnay/rust-toolchain@master - with: - toolchain: "1.74" - - - name: Cross Build ${{ matrix.target }} ${{ matrix.bin }} binary - if: matrix.target == 'armv7-unknown-linux-gnueabihf' - run: | - curl -L "https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz" | tar xzv - sudo mv cross /usr/bin - sudo mv cross-util /usr/bin - cross build --target=${{ matrix.target }} --release --package swap --bin ${{ matrix.bin }} - - - name: Build ${{ matrix.target }} ${{ matrix.bin }} release binary - if: matrix.target != 'armv7-unknown-linux-gnueabihf' - run: cargo build --target=${{ matrix.target }} --release --package swap --bin ${{ matrix.bin }} - - - name: Smoke test the binary - if: matrix.target != 'armv7-unknown-linux-gnueabihf' - run: target/${{ matrix.target }}/release/${{ matrix.bin }} --help - - - id: create-archive-name - shell: python # Use python to have a prettier name for the archive on Windows. - run: | - import platform - os_info = platform.uname() - - arch = os_info.machine - - triple = "${{ matrix.target }}".split("-") - arch = triple[0] - - archive_name=f'${{ matrix.bin }}_${{ github.event.release.tag_name }}_{os_info.system}_{arch}.${{ matrix.archive_ext }}' - - print(f'::set-output name=archive::{archive_name}') - - - name: Pack macos archive - if: startsWith(matrix.os, 'macos') - shell: bash - run: gtar -C ./target/${{ matrix.target }}/release --create --file=${{ steps.create-archive-name.outputs.archive }} ${{ matrix.bin }} - - - name: Pack linux archive - if: matrix.os == 'ubuntu-latest' - shell: bash - run: tar -C ./target/${{ matrix.target }}/release --create --file=${{ steps.create-archive-name.outputs.archive }} ${{ matrix.bin }} - - - name: Pack windows archive - if: matrix.os == 'windows-latest' - shell: bash - run: | - cp target/${{ matrix.target }}/release/${{ matrix.bin }}.exe ./${{ matrix.bin }}.exe - 7z a -tzip ${{ steps.create-archive-name.outputs.archive }} ./${{ matrix.bin }}.exe - - - name: Upload archive - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./${{ steps.create-archive-name.outputs.archive }} - asset_name: ${{ steps.create-archive-name.outputs.archive }} - asset_content_type: application/gzip diff --git a/src-xmr-btc-swap/.github/workflows/ci.yml b/src-xmr-btc-swap/.github/workflows/ci.yml deleted file mode 100644 index b3f742fc..00000000 --- a/src-xmr-btc-swap/.github/workflows/ci.yml +++ /dev/null @@ -1,203 +0,0 @@ -name: CI - -on: - pull_request: # Need to run on pull-requests, otherwise PRs from forks don't run - push: - branches: - - "master" # Always build head of master for the badge in the README - -jobs: - static_analysis: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: dtolnay/rust-toolchain@master - with: - toolchain: "1.74" - components: clippy,rustfmt - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Check formatting - uses: dprint/check@v2.2 - with: - dprint-version: 0.39.1 - - - name: Run clippy with default features - run: cargo clippy --workspace --all-targets -- -D warnings - - - name: Run clippy with all features enabled - run: cargo clippy --workspace --all-targets --all-features -- -D warnings - - bdk_test: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Build swap - run: cargo build --bin swap - - - name: Run BDK regression script - run: ./swap/tests/bdk.sh - - sqlx_test: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Install sqlx-cli - run: cargo install --locked --version 0.6.3 sqlx-cli - - - name: Run sqlite_dev_setup.sh script - run: | - cd swap - ./sqlite_dev_setup.sh - - build: - strategy: - matrix: - include: - - target: x86_64-unknown-linux-gnu - os: ubuntu-latest - - target: armv7-unknown-linux-gnueabihf - os: ubuntu-latest - - target: x86_64-apple-darwin - os: macos-12 - - target: aarch64-apple-darwin - os: macos-latest - - target: x86_64-pc-windows-msvc - os: windows-latest - runs-on: ${{ matrix.os }} - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - uses: dtolnay/rust-toolchain@master - with: - toolchain: "1.74" - targets: armv7-unknown-linux-gnueabihf - - - name: Build binary - if: matrix.target != 'armv7-unknown-linux-gnueabihf' - run: cargo build -p swap --target ${{ matrix.target }} - - - name: Install cross (armv7) - if: matrix.target == 'armv7-unknown-linux-gnueabihf' - run: cargo install cross --locked - - - name: Build binary (armv7) - if: matrix.target == 'armv7-unknown-linux-gnueabihf' - run: cross build -p swap --target ${{ matrix.target }} - - - name: Upload swap binary - uses: actions/upload-artifact@v4 - with: - name: swap-${{ matrix.target }} - path: target/${{ matrix.target }}/debug/swap - - - name: Upload asb binary - uses: actions/upload-artifact@v4 - with: - name: asb-${{ matrix.target }} - path: target/${{ matrix.target }}/debug/asb - - test: - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - runs-on: ${{ matrix.os }} - steps: - - name: (Free disk space on Ubuntu) - if: matrix.os == 'ubuntu-latest' - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be - with: - # removing all of these takes ~10 mins, so just do as needed - android: true - dotnet: true - haskell: true - docker-images: false - large-packages: false - swap-storage: false - tool-cache: false - - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Build tests - run: cargo build --tests --workspace --all-features - - - name: Run monero-harness tests - if: matrix.os == 'ubuntu-latest' - run: cargo test --package monero-harness --all-features - - - name: Run library tests for swap - run: cargo test --package swap --lib --all-features - - docker_tests: - strategy: - matrix: - test_name: - [ - happy_path, - happy_path_restart_bob_after_xmr_locked, - happy_path_restart_bob_before_xmr_locked, - happy_path_restart_alice_after_xmr_locked, - alice_and_bob_refund_using_cancel_and_refund_command, - alice_and_bob_refund_using_cancel_then_refund_command, - alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired, - alice_manually_punishes_after_bob_dead_and_bob_cancels, - punish, - alice_punishes_after_restart_bob_dead, - alice_manually_punishes_after_bob_dead, - alice_refunds_after_restart_bob_refunded, - ensure_same_swap_id, - concurrent_bobs_before_xmr_lock_proof_sent, - concurrent_bobs_after_xmr_lock_proof_sent, - alice_manually_redeems_after_enc_sig_learned, - happy_path_bob_offline_while_alice_redeems_btc, - ] - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Run test ${{ matrix.test_name }} - run: cargo test --package swap --all-features --test ${{ matrix.test_name }} -- --nocapture - - rpc_tests: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Run RPC server tests - run: cargo test --package swap --all-features --test rpc -- --nocapture - - check_stable: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4.1.7 - - - uses: dtolnay/rust-toolchain@stable - - - uses: Swatinem/rust-cache@v2.7.3 - - - name: Run cargo check on stable rust - run: cargo check --all-targets diff --git a/src-xmr-btc-swap/.github/workflows/create-release.yml b/src-xmr-btc-swap/.github/workflows/create-release.yml deleted file mode 100644 index 443c4418..00000000 --- a/src-xmr-btc-swap/.github/workflows/create-release.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: "Create release" - -on: - pull_request: - types: - - closed - -jobs: - create_release: - name: Create from merged release branch - if: github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.7 - - - name: Extract version from branch name - id: extract-version - shell: python - run: | - branch_name = "${{ github.event.pull_request.head.ref }}" - version = branch_name.split("/")[1] - - print(f"::set-output name=version::{version}") - - - name: Extract changelog section for release - id: changelog - uses: coditory/changelog-parser@v1 - with: - version: ${{ steps.extract-version.outputs.version }} - - - name: Create release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }} - with: - tag_name: ${{ steps.extract-version.outputs.version }} - release_name: ${{ steps.extract-version.outputs.version }} - draft: false - prerelease: false - body: ${{ steps.changelog.outputs.description }} - commitish: ${{ github.event.pull_request.merge_commit_sha }} diff --git a/src-xmr-btc-swap/.github/workflows/draft-new-release.yml b/src-xmr-btc-swap/.github/workflows/draft-new-release.yml deleted file mode 100644 index 74ff34ba..00000000 --- a/src-xmr-btc-swap/.github/workflows/draft-new-release.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: "Draft new release" - -on: - workflow_dispatch: - inputs: - version: - description: "The new version in X.Y.Z format." - required: true - -jobs: - draft-new-release: - name: "Draft a new release" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.7 - with: - token: ${{ secrets.BOTTY_GITHUB_TOKEN }} - - - name: Create release branch - run: git checkout -b release/${{ github.event.inputs.version }} - - - name: Update changelog - uses: thomaseizinger/keep-a-changelog-new-release@3.0.0 - with: - version: ${{ github.event.inputs.version }} - changelogPath: CHANGELOG.md - - - name: Initialize mandatory git config - run: | - git config user.name "${{ secrets.BOTTY_NAME }}" - git config user.email ${{ secrets.BOTTY_EMAIL }} - - - name: Bump version in Cargo.toml - uses: thomaseizinger/set-crate-version@1.0.0 - with: - version: ${{ github.event.inputs.version }} - manifest: swap/Cargo.toml - - - name: Update Cargo.lock - run: cargo update --workspace - - - name: Commit changelog and manifest files - id: make-commit - env: - DPRINT_VERSION: "0.39.1" - RUST_TOOLCHAIN: "1.74" - run: | - rustup component add rustfmt --toolchain "$RUST_TOOLCHAIN-x86_64-unknown-linux-gnu" - curl -fsSL https://dprint.dev/install.sh | sh -s $DPRINT_VERSION - /home/runner/.dprint/bin/dprint fmt - - git add CHANGELOG.md Cargo.lock swap/Cargo.toml - git commit --message "Prepare release ${{ github.event.inputs.version }}" - - echo "::set-output name=commit::$(git rev-parse HEAD)" - - - name: Push new branch - run: git push origin release/${{ github.event.inputs.version }} --force - - - name: Create pull request - uses: thomaseizinger/create-pull-request@1.4.0 - with: - GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }} - head: release/${{ github.event.inputs.version }} - base: master - title: Release version ${{ github.event.inputs.version }} - reviewers: ${{ github.actor }} - body: | - Hi @${{ github.actor }}! - - This PR was created in response to a manual trigger of the release workflow here: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}. - I've updated the changelog and bumped the versions in the manifest files in this commit: ${{ steps.make-commit.outputs.commit }}. - - Merging this PR will create a GitHub release and upload any assets that are created as part of the release build. diff --git a/src-xmr-btc-swap/.github/workflows/preview-release.yml b/src-xmr-btc-swap/.github/workflows/preview-release.yml deleted file mode 100644 index ccd7e641..00000000 --- a/src-xmr-btc-swap/.github/workflows/preview-release.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: "Create 'preview' release" - -on: - push: - branches: - - master - -jobs: - create_release: - name: Create preview release - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.7 - - - name: Delete 'preview' release - uses: larryjoelane/delete-release-action@v1.0.24 - with: - release-name: preview - token: ${{ secrets.BOTTY_GITHUB_TOKEN }} - - - name: Give GitHub some time to process the deletion, otherwise our release shows up as draft. Sigh. - run: sleep 10 - - - name: Extract changelog section for release - id: changelog - uses: coditory/changelog-parser@v1 - with: - version: unreleased - - - name: Create 'preview' release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.BOTTY_GITHUB_TOKEN }} - with: - tag_name: preview - release_name: preview - draft: false - prerelease: true - body: ${{ steps.changelog.outputs.description }} diff --git a/src-xmr-btc-swap/.gitignore b/src-xmr-btc-swap/.gitignore deleted file mode 100644 index 9b4798c4..00000000 --- a/src-xmr-btc-swap/.gitignore +++ /dev/null @@ -1,163 +0,0 @@ -# Created by https://www.toptal.com/developers/gitignore/api/rust,clion+all,emacs -# Edit at https://www.toptal.com/developers/gitignore?templates=rust,clion+all,emacs - -### CLion+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### CLion+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -# Sonarlint plugin -.idea/sonarlint - -### Emacs ### -# -*- mode: gitignore; -*- -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -*.elc -auto-save-list -tramp -.\#* - -# Org-mode -.org-id-locations -*_archive - -# flymake-mode -*_flymake.* - -# eshell files -/eshell/history -/eshell/lastdir - -# elpa packages -/elpa/ - -# reftex files -*.rel - -# AUCTeX auto folder -/auto/ - -# cask packages -.cask/ -dist/ - -# Flycheck -flycheck_*.el - -# server auth directory -/server/ - -# projectiles files -.projectile - -# directory configuration -.dir-locals.el - -# network security -/network-security.data - - -### Rust ### -# Generated by Cargo -# will have compiled files and executables -/target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -# Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk - -# sled DB directory generated during local development -.swap-db/ - -# End of https://www.toptal.com/developers/gitignore/api/rust,clion+all,emacs - -*.log -.vscode -swap/tempdb diff --git a/src-xmr-btc-swap/swap/Cargo.toml b/swap/Cargo.toml similarity index 100% rename from src-xmr-btc-swap/swap/Cargo.toml rename to swap/Cargo.toml diff --git a/src-xmr-btc-swap/swap/build.rs b/swap/build.rs similarity index 100% rename from src-xmr-btc-swap/swap/build.rs rename to swap/build.rs diff --git a/src-xmr-btc-swap/swap/migrations/20210903050345_create_swaps_table.sql b/swap/migrations/20210903050345_create_swaps_table.sql similarity index 100% rename from src-xmr-btc-swap/swap/migrations/20210903050345_create_swaps_table.sql rename to swap/migrations/20210903050345_create_swaps_table.sql diff --git a/src-xmr-btc-swap/swap/migrations/20240615140942_btcpunished_update.sql b/swap/migrations/20240615140942_btcpunished_update.sql similarity index 100% rename from src-xmr-btc-swap/swap/migrations/20240615140942_btcpunished_update.sql rename to swap/migrations/20240615140942_btcpunished_update.sql diff --git a/src-xmr-btc-swap/swap/migrations/20240701231624_create_buffered_transfer_proofs_table.sql b/swap/migrations/20240701231624_create_buffered_transfer_proofs_table.sql similarity index 100% rename from src-xmr-btc-swap/swap/migrations/20240701231624_create_buffered_transfer_proofs_table.sql rename to swap/migrations/20240701231624_create_buffered_transfer_proofs_table.sql diff --git a/src-xmr-btc-swap/swap/proptest-regressions/bitcoin/wallet.txt b/swap/proptest-regressions/bitcoin/wallet.txt similarity index 100% rename from src-xmr-btc-swap/swap/proptest-regressions/bitcoin/wallet.txt rename to swap/proptest-regressions/bitcoin/wallet.txt diff --git a/src-xmr-btc-swap/swap/sqlite_dev_setup.sh b/swap/sqlite_dev_setup.sh similarity index 100% rename from src-xmr-btc-swap/swap/sqlite_dev_setup.sh rename to swap/sqlite_dev_setup.sh diff --git a/src-xmr-btc-swap/swap/sqlx-data.json b/swap/sqlx-data.json similarity index 100% rename from src-xmr-btc-swap/swap/sqlx-data.json rename to swap/sqlx-data.json diff --git a/src-xmr-btc-swap/swap/src/api.rs b/swap/src/api.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/api.rs rename to swap/src/api.rs diff --git a/src-xmr-btc-swap/swap/src/api/request.rs b/swap/src/api/request.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/api/request.rs rename to swap/src/api/request.rs diff --git a/src-xmr-btc-swap/swap/src/asb.rs b/swap/src/asb.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb.rs rename to swap/src/asb.rs diff --git a/src-xmr-btc-swap/swap/src/asb/command.rs b/swap/src/asb/command.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/command.rs rename to swap/src/asb/command.rs diff --git a/src-xmr-btc-swap/swap/src/asb/config.rs b/swap/src/asb/config.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/config.rs rename to swap/src/asb/config.rs diff --git a/src-xmr-btc-swap/swap/src/asb/event_loop.rs b/swap/src/asb/event_loop.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/event_loop.rs rename to swap/src/asb/event_loop.rs diff --git a/src-xmr-btc-swap/swap/src/asb/network.rs b/swap/src/asb/network.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/network.rs rename to swap/src/asb/network.rs diff --git a/src-xmr-btc-swap/swap/src/asb/rate.rs b/swap/src/asb/rate.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/rate.rs rename to swap/src/asb/rate.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery.rs b/swap/src/asb/recovery.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery.rs rename to swap/src/asb/recovery.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery/cancel.rs b/swap/src/asb/recovery/cancel.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery/cancel.rs rename to swap/src/asb/recovery/cancel.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery/punish.rs b/swap/src/asb/recovery/punish.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery/punish.rs rename to swap/src/asb/recovery/punish.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery/redeem.rs b/swap/src/asb/recovery/redeem.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery/redeem.rs rename to swap/src/asb/recovery/redeem.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery/refund.rs b/swap/src/asb/recovery/refund.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery/refund.rs rename to swap/src/asb/recovery/refund.rs diff --git a/src-xmr-btc-swap/swap/src/asb/recovery/safely_abort.rs b/swap/src/asb/recovery/safely_abort.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/recovery/safely_abort.rs rename to swap/src/asb/recovery/safely_abort.rs diff --git a/src-xmr-btc-swap/swap/src/asb/tracing.rs b/swap/src/asb/tracing.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/asb/tracing.rs rename to swap/src/asb/tracing.rs diff --git a/src-xmr-btc-swap/swap/src/bin.rs b/swap/src/bin.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bin.rs rename to swap/src/bin.rs diff --git a/src-xmr-btc-swap/swap/src/bin/asb.rs b/swap/src/bin/asb.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bin/asb.rs rename to swap/src/bin/asb.rs diff --git a/src-xmr-btc-swap/swap/src/bin/kraken_ticker.rs b/swap/src/bin/kraken_ticker.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bin/kraken_ticker.rs rename to swap/src/bin/kraken_ticker.rs diff --git a/src-xmr-btc-swap/swap/src/bin/swap.rs b/swap/src/bin/swap.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bin/swap.rs rename to swap/src/bin/swap.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin.rs b/swap/src/bitcoin.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin.rs rename to swap/src/bitcoin.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/cancel.rs b/swap/src/bitcoin/cancel.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/cancel.rs rename to swap/src/bitcoin/cancel.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/lock.rs b/swap/src/bitcoin/lock.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/lock.rs rename to swap/src/bitcoin/lock.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/punish.rs b/swap/src/bitcoin/punish.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/punish.rs rename to swap/src/bitcoin/punish.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/redeem.rs b/swap/src/bitcoin/redeem.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/redeem.rs rename to swap/src/bitcoin/redeem.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/refund.rs b/swap/src/bitcoin/refund.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/refund.rs rename to swap/src/bitcoin/refund.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/timelocks.rs b/swap/src/bitcoin/timelocks.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/timelocks.rs rename to swap/src/bitcoin/timelocks.rs diff --git a/src-xmr-btc-swap/swap/src/bitcoin/wallet.rs b/swap/src/bitcoin/wallet.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/bitcoin/wallet.rs rename to swap/src/bitcoin/wallet.rs diff --git a/src-xmr-btc-swap/swap/src/cli.rs b/swap/src/cli.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli.rs rename to swap/src/cli.rs diff --git a/src-xmr-btc-swap/swap/src/cli/behaviour.rs b/swap/src/cli/behaviour.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/behaviour.rs rename to swap/src/cli/behaviour.rs diff --git a/src-xmr-btc-swap/swap/src/cli/cancel_and_refund.rs b/swap/src/cli/cancel_and_refund.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/cancel_and_refund.rs rename to swap/src/cli/cancel_and_refund.rs diff --git a/src-xmr-btc-swap/swap/src/cli/command.rs b/swap/src/cli/command.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/command.rs rename to swap/src/cli/command.rs diff --git a/src-xmr-btc-swap/swap/src/cli/event_loop.rs b/swap/src/cli/event_loop.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/event_loop.rs rename to swap/src/cli/event_loop.rs diff --git a/src-xmr-btc-swap/swap/src/cli/list_sellers.rs b/swap/src/cli/list_sellers.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/list_sellers.rs rename to swap/src/cli/list_sellers.rs diff --git a/src-xmr-btc-swap/swap/src/cli/tracing.rs b/swap/src/cli/tracing.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/tracing.rs rename to swap/src/cli/tracing.rs diff --git a/src-xmr-btc-swap/swap/src/cli/transport.rs b/swap/src/cli/transport.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/cli/transport.rs rename to swap/src/cli/transport.rs diff --git a/src-xmr-btc-swap/swap/src/common.rs b/swap/src/common.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/common.rs rename to swap/src/common.rs diff --git a/src-xmr-btc-swap/swap/src/database.rs b/swap/src/database.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/database.rs rename to swap/src/database.rs diff --git a/src-xmr-btc-swap/swap/src/database/alice.rs b/swap/src/database/alice.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/database/alice.rs rename to swap/src/database/alice.rs diff --git a/src-xmr-btc-swap/swap/src/database/bob.rs b/swap/src/database/bob.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/database/bob.rs rename to swap/src/database/bob.rs diff --git a/src-xmr-btc-swap/swap/src/database/sqlite.rs b/swap/src/database/sqlite.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/database/sqlite.rs rename to swap/src/database/sqlite.rs diff --git a/src-xmr-btc-swap/swap/src/env.rs b/swap/src/env.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/env.rs rename to swap/src/env.rs diff --git a/src-xmr-btc-swap/swap/src/fs.rs b/swap/src/fs.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/fs.rs rename to swap/src/fs.rs diff --git a/src-xmr-btc-swap/swap/src/kraken.rs b/swap/src/kraken.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/kraken.rs rename to swap/src/kraken.rs diff --git a/src-xmr-btc-swap/swap/src/lib.rs b/swap/src/lib.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/lib.rs rename to swap/src/lib.rs diff --git a/src-xmr-btc-swap/swap/src/libp2p_ext.rs b/swap/src/libp2p_ext.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/libp2p_ext.rs rename to swap/src/libp2p_ext.rs diff --git a/src-xmr-btc-swap/swap/src/monero.rs b/swap/src/monero.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/monero.rs rename to swap/src/monero.rs diff --git a/src-xmr-btc-swap/swap/src/monero/wallet.rs b/swap/src/monero/wallet.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/monero/wallet.rs rename to swap/src/monero/wallet.rs diff --git a/src-xmr-btc-swap/swap/src/monero/wallet_rpc.rs b/swap/src/monero/wallet_rpc.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/monero/wallet_rpc.rs rename to swap/src/monero/wallet_rpc.rs diff --git a/src-xmr-btc-swap/swap/src/monero_ext.rs b/swap/src/monero_ext.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/monero_ext.rs rename to swap/src/monero_ext.rs diff --git a/src-xmr-btc-swap/swap/src/network.rs b/swap/src/network.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network.rs rename to swap/src/network.rs diff --git a/src-xmr-btc-swap/swap/src/network/cbor_request_response.rs b/swap/src/network/cbor_request_response.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/cbor_request_response.rs rename to swap/src/network/cbor_request_response.rs diff --git a/src-xmr-btc-swap/swap/src/network/cooperative_xmr_redeem_after_punish.rs b/swap/src/network/cooperative_xmr_redeem_after_punish.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/cooperative_xmr_redeem_after_punish.rs rename to swap/src/network/cooperative_xmr_redeem_after_punish.rs diff --git a/src-xmr-btc-swap/swap/src/network/encrypted_signature.rs b/swap/src/network/encrypted_signature.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/encrypted_signature.rs rename to swap/src/network/encrypted_signature.rs diff --git a/src-xmr-btc-swap/swap/src/network/impl_from_rr_event.rs b/swap/src/network/impl_from_rr_event.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/impl_from_rr_event.rs rename to swap/src/network/impl_from_rr_event.rs diff --git a/src-xmr-btc-swap/swap/src/network/json_pull_codec.rs b/swap/src/network/json_pull_codec.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/json_pull_codec.rs rename to swap/src/network/json_pull_codec.rs diff --git a/src-xmr-btc-swap/swap/src/network/quote.rs b/swap/src/network/quote.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/quote.rs rename to swap/src/network/quote.rs diff --git a/src-xmr-btc-swap/swap/src/network/redial.rs b/swap/src/network/redial.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/redial.rs rename to swap/src/network/redial.rs diff --git a/src-xmr-btc-swap/swap/src/network/rendezvous.rs b/swap/src/network/rendezvous.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/rendezvous.rs rename to swap/src/network/rendezvous.rs diff --git a/src-xmr-btc-swap/swap/src/network/swap_setup.rs b/swap/src/network/swap_setup.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/swap_setup.rs rename to swap/src/network/swap_setup.rs diff --git a/src-xmr-btc-swap/swap/src/network/swap_setup/alice.rs b/swap/src/network/swap_setup/alice.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/swap_setup/alice.rs rename to swap/src/network/swap_setup/alice.rs diff --git a/src-xmr-btc-swap/swap/src/network/swap_setup/bob.rs b/swap/src/network/swap_setup/bob.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/swap_setup/bob.rs rename to swap/src/network/swap_setup/bob.rs diff --git a/src-xmr-btc-swap/swap/src/network/swarm.rs b/swap/src/network/swarm.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/swarm.rs rename to swap/src/network/swarm.rs diff --git a/src-xmr-btc-swap/swap/src/network/test.rs b/swap/src/network/test.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/test.rs rename to swap/src/network/test.rs diff --git a/src-xmr-btc-swap/swap/src/network/tor_transport.rs b/swap/src/network/tor_transport.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/tor_transport.rs rename to swap/src/network/tor_transport.rs diff --git a/src-xmr-btc-swap/swap/src/network/transfer_proof.rs b/swap/src/network/transfer_proof.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/transfer_proof.rs rename to swap/src/network/transfer_proof.rs diff --git a/src-xmr-btc-swap/swap/src/network/transport.rs b/swap/src/network/transport.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/network/transport.rs rename to swap/src/network/transport.rs diff --git a/src-xmr-btc-swap/swap/src/proptest.rs b/swap/src/proptest.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/proptest.rs rename to swap/src/proptest.rs diff --git a/src-xmr-btc-swap/swap/src/protocol.rs b/swap/src/protocol.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol.rs rename to swap/src/protocol.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/alice.rs b/swap/src/protocol/alice.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/alice.rs rename to swap/src/protocol/alice.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/alice/state.rs b/swap/src/protocol/alice/state.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/alice/state.rs rename to swap/src/protocol/alice/state.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/alice/swap.rs b/swap/src/protocol/alice/swap.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/alice/swap.rs rename to swap/src/protocol/alice/swap.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/bob.rs b/swap/src/protocol/bob.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/bob.rs rename to swap/src/protocol/bob.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/bob/state.rs b/swap/src/protocol/bob/state.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/bob/state.rs rename to swap/src/protocol/bob/state.rs diff --git a/src-xmr-btc-swap/swap/src/protocol/bob/swap.rs b/swap/src/protocol/bob/swap.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/protocol/bob/swap.rs rename to swap/src/protocol/bob/swap.rs diff --git a/src-xmr-btc-swap/swap/src/rpc.rs b/swap/src/rpc.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/rpc.rs rename to swap/src/rpc.rs diff --git a/src-xmr-btc-swap/swap/src/rpc/methods.rs b/swap/src/rpc/methods.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/rpc/methods.rs rename to swap/src/rpc/methods.rs diff --git a/src-xmr-btc-swap/swap/src/seed.rs b/swap/src/seed.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/seed.rs rename to swap/src/seed.rs diff --git a/src-xmr-btc-swap/swap/src/tor.rs b/swap/src/tor.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/tor.rs rename to swap/src/tor.rs diff --git a/src-xmr-btc-swap/swap/src/tracing_ext.rs b/swap/src/tracing_ext.rs similarity index 100% rename from src-xmr-btc-swap/swap/src/tracing_ext.rs rename to swap/src/tracing_ext.rs diff --git a/swap/tempdb b/swap/tempdb new file mode 100644 index 0000000000000000000000000000000000000000..915791a7f1233da64cf87ea075a645d4616331b9 GIT binary patch literal 49152 zcmeI(Z)h8390%~bq{$^|yU0{-D2xZHtY_EJq{ZT(&ZIj>F-^KO)s=y_GXRB21Xi-6idEHl^&9_Pz({ zJBug2zQiMB?D?fIM1 zt&$#Y&*5li_%E(Kc$M3>5Wdto-x=+YJ676X?6@oRbMR{DbgNTw90Cx400bZa0SG`~ zvjWvvNDzmH_}ZODc50SRRi>w@M)QiHWs5pXDrK!yn$}w#Zy!#}v5ZVIv3Nozt!jn3 zLxgSm)7i43=FKF@$cHlKek?sQ8cR=-N90M8Ol3%NB9Yi_)wV8dR$*JCww<$oHfo2Y zRJ&iy4e^{>%+opj=q&pqRmoP2l9g9lHA;!JD(R?p1qD%(_!@7alqqw_=JOiWb*eY# zLQMdUGCOSRpd;+{0Ac&&KS4*p{v>K-e{?#V^)_TB+9z_cCno|nu6I#|#OGVw8_cVbxONl*CpJJnwolN2*2N=rD zAa?8WRL^N@*}Q-qOXCyBE>?@I`Lna^v(qde8I{K~vC*+rJ+fbZI5v^Ukl~4RT25w^ z)hhMaD>*hMbP`Xc5^^lLdY)aHo1wWU^-6)n6REhPjLy+q#cY*gs0G?+exq?AX`g4K zQS8J}BF-aT_PZot{yynsFYmU?T=+~l%68Zw009U<00Izz00bZa0SG_<0{dGyn>lj@4`!Sxd#fBTxS82>HacH#{6 z2)>AY<+JCnC8vyBxl&a18JZ`Ra-Owfoy(k$FL{lLm+xQt;*G}7++j-CD!~4$#Us^cz%r~-l`;BAE!3z%rcAZ+eKKj#+S6@FoaG`st=OeL3L#$W5 z;bkuTXZRPk!v+BeKmY;|fB*y_009U<00Izz!2eJn{300Izz00bZa0SG_<0`3sN^M7~rGopk51Rwwb2tWV=5P$## zAOHb(3*h;`yZax}LjVF0fB*y_009U<00IzzfI9?m|L=}|MwAeM00bZa0SG_<0uX=z k1R&sU0et`8-TjZ~ApijgKmY;|fB*y_009U