From 21edd1727214ef600898c0859beefec3238e9257 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 15 Dec 2023 14:52:15 +0800 Subject: [PATCH 1/4] restructure rpcs paths, fix references --- .../assets/languages/atomic_defi_de.ts | 58 +++++++++++-------- .../assets/languages/atomic_defi_en.ts | 58 +++++++++++-------- .../assets/languages/atomic_defi_es.ts | 58 +++++++++++-------- .../assets/languages/atomic_defi_fr.ts | 58 +++++++++++-------- .../assets/languages/atomic_defi_ru.ts | 58 +++++++++++-------- .../assets/languages/atomic_defi_tr.ts | 58 +++++++++++-------- src/core/atomicdex/api/mm2/balance_info.cpp | 2 +- src/core/atomicdex/api/mm2/generics.cpp | 2 +- .../atomicdex/api/mm2/get_public_key_rpc.hpp | 2 +- src/core/atomicdex/api/mm2/mm2.client.cpp | 16 ++--- src/core/atomicdex/api/mm2/mm2.client.hpp | 4 +- src/core/atomicdex/api/mm2/mm2.cpp | 6 +- .../atomicdex/api/mm2/my_tx_history_rpc.hpp | 6 +- .../api/mm2/my_tx_history_v1_rpc.hpp | 2 +- src/core/atomicdex/api/mm2/paging_options.cpp | 2 +- src/core/atomicdex/api/mm2/rpc.cpp | 2 +- src/core/atomicdex/api/mm2/rpc.tx.history.hpp | 4 +- .../api/mm2/{ => rpc_v2}/rpc2.best.orders.cpp | 2 +- .../api/mm2/{ => rpc_v2}/rpc2.best.orders.hpp | 0 .../rpc2.enable_bch_with_tokens_rpc.cpp} | 2 +- .../rpc2.enable_bch_with_tokens_rpc.hpp} | 4 +- .../rpc2.enable_slp_rpc.cpp} | 2 +- .../rpc2.enable_slp_rpc.hpp} | 4 +- .../rpc2.enable_tendermint_token.cpp | 0 .../rpc2.enable_tendermint_token.hpp | 4 +- .../rpc2.enable_tendermint_with_assets.cpp | 0 .../rpc2.enable_tendermint_with_assets.hpp | 4 +- .../rpc2.task.enable_z_coin.cancel.cpp | 2 +- .../rpc2.task.enable_z_coin.cancel.hpp | 2 +- .../rpc2.task.enable_z_coin.init.cpp | 2 +- .../rpc2.task.enable_z_coin.init.hpp | 0 .../rpc2.task.enable_z_coin.status.cpp | 2 +- .../rpc2.task.enable_z_coin.status.hpp | 2 +- .../{ => rpc_v2}/rpc2.task.withdraw.init.cpp | 2 +- .../{ => rpc_v2}/rpc2.task.withdraw.init.hpp | 0 .../rpc2.task.withdraw.status.cpp | 2 +- .../rpc2.task.withdraw.status.hpp | 0 .../api/mm2/{ => rpc_v2}/rpc2.withdraw.cpp | 0 .../api/mm2/{ => rpc_v2}/rpc2.withdraw.hpp | 0 .../{ => rpc_v2}/rpc2.z_coin_tx_history.cpp | 2 +- .../{ => rpc_v2}/rpc2.z_coin_tx_history.hpp | 2 +- src/core/atomicdex/pages/qt.wallet.page.cpp | 6 +- .../atomicdex/services/mm2/mm2.service.cpp | 6 +- .../atomicdex/services/mm2/mm2.service.hpp | 8 +-- .../price/orderbook.scanner.service.cpp | 2 +- .../price/orderbook.scanner.service.hpp | 2 +- .../mm2/enable_bch_with_tokens_rpc_tests.cpp | 2 +- 47 files changed, 261 insertions(+), 201 deletions(-) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.best.orders.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.best.orders.hpp (100%) rename src/core/atomicdex/api/mm2/{enable_bch_with_tokens_rpc.cpp => rpc_v2/rpc2.enable_bch_with_tokens_rpc.cpp} (98%) rename src/core/atomicdex/api/mm2/{enable_bch_with_tokens_rpc.hpp => rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp} (97%) rename src/core/atomicdex/api/mm2/{enable_slp_rpc.cpp => rpc_v2/rpc2.enable_slp_rpc.cpp} (95%) rename src/core/atomicdex/api/mm2/{enable_slp_rpc.hpp => rpc_v2/rpc2.enable_slp_rpc.hpp} (96%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.enable_tendermint_token.cpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.enable_tendermint_token.hpp (96%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.enable_tendermint_with_assets.cpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.enable_tendermint_with_assets.hpp (96%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.cancel.cpp (96%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.cancel.hpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.init.cpp (97%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.init.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.status.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.enable_z_coin.status.hpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.withdraw.init.cpp (97%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.withdraw.init.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.withdraw.status.cpp (96%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.task.withdraw.status.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.withdraw.cpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.withdraw.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.z_coin_tx_history.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v2}/rpc2.z_coin_tx_history.hpp (98%) diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 03f60e356c..2a7b4afc2f 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -3552,12 +3552,17 @@ Bitte wählen Sie eine neue Order aus. Kennwort der Brieftasche ist falsch - + + Reuse static RPC password + + + + Application Version Anwendungsversion - + copied to clipboard In die Zwischenablage kopiert @@ -3595,7 +3600,7 @@ Bitte wählen Sie eine neue Order aus. - + Show Zeigen @@ -3610,52 +3615,52 @@ Bitte wählen Sie eine neue Order aus. Öffnen - + Disclaimer and ToS Haftungsausschluss und Nutzungsbedingungen - + Application version Anwendungsversion - + MM2 version MM2 Version - + MM2 Version MM2 Version - + MM2 Version copied to clipboard. MM2 Version in die Zwischenablage kopiert. - + Qt version Qt Version - + Qt Version Qt Version - + Qt Version copied to clipboard. Qt Version in die Zwischenablage kopiert. - + Search Update Update suchen - + Logout Abmelden @@ -3696,12 +3701,12 @@ Bitte wählen Sie eine neue Order aus. CEX-Kurs - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 ist nicht aktiviert - Möchten Sie es aktivieren, um die günstigsten Order von %2 auswählen zu können? <br><a href='#'>Ja</a> - <a href='#no'>Nein</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4189,37 +4194,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. Keine Kauforder für %1 gefunden. - + You can check later or try to sell a different coin. Sie können später nachsehen oder versuchen, einen anderen Coin zu verkaufen. - + Calculating fee estimate... Geschätzten Gebühren werden berechnet... - + Total %1 fees: %1 Gesamtgebühren: - + %2 (%3) %2 (%3) @@ -4536,7 +4546,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts index 40460fba05..c5f21ab0ca 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_en.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts @@ -3489,12 +3489,12 @@ Please select a new order. - + Application Version - + copied to clipboard @@ -3593,7 +3593,7 @@ Please select a new order. - + Show @@ -3608,52 +3608,57 @@ Please select a new order. - + + Reuse static RPC password + + + + Disclaimer and ToS - + Application version - + MM2 version - + MM2 Version - + MM2 Version copied to clipboard. - + Qt version - + Qt Version - + Qt Version copied to clipboard. - + Search Update - + Logout @@ -3694,12 +3699,12 @@ Please select a new order. - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4171,37 +4176,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: - + %2 (%3) @@ -4518,7 +4528,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts index 5aa283bf8f..f739653a59 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_es.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts @@ -3493,12 +3493,12 @@ Seleccione un nuevo pedido. Cambiando el tema a %1 - + Application Version La versión de la aplicación - + copied to clipboard copiado al portapapeles @@ -3597,7 +3597,7 @@ Seleccione un nuevo pedido. - + Show Mostrar @@ -3612,52 +3612,57 @@ Seleccione un nuevo pedido. Abrir - + + Reuse static RPC password + + + + Disclaimer and ToS Descargo de Responsabilidad y Terminos de Servicio - + Application version Versión de Aplicación - + MM2 version Versión MM2 - + MM2 Version Versión MM2 - + MM2 Version copied to clipboard. Versión MM2 copiada al portapapeles. - + Qt version Versión Qt - + Qt Version Versión Qt - + Qt Version copied to clipboard. Versión de Qt copiada al portapapeles. - + Search Update Buscar Actualizacion - + Logout Cerrar sesión @@ -3698,12 +3703,12 @@ Seleccione un nuevo pedido. Tasa CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 no está habilitado. ¿Desea habilitarlo para poder seleccionar %2 mejores ordenes?<br><a href='#'>Sí</a> - <a href='#no'>No</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4191,37 +4196,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. No se encontraron órdenes de compra para %1. - + You can check later or try to sell a different coin. Puede verificar más tarde o intentar vender una moneda diferente. - + Calculating fee estimate... Calculando tarifa estimada... - + Total %1 fees: Total de %1 tarifas: - + %2 (%3) %2 (%3) @@ -4539,7 +4549,7 @@ Esto puede tardar unos minutos... atomic_dex::settings_page - + An error has occurred. Se ha producido un error. diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts index 26517a64a6..c342c96189 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts @@ -3552,12 +3552,17 @@ Please select a new order. - + + Reuse static RPC password + + + + Application Version - + copied to clipboard copié dans le presse-papier @@ -3587,47 +3592,47 @@ Please select a new order. Demander le mot de passe du système avant d'envoyer des actifs ? (2FA) - + Application version Version de l'application - + MM2 version Version de MM2 - + MM2 Version MM2 Version - + MM2 Version copied to clipboard. MM2 Version copiée dans le presse-papiers. - + Qt version Version de Qt - + Qt Version Qt Version - + Qt Version copied to clipboard. Version Qt copiée dans le presse-papiers. - + Search Update Rechercher une mise à jour - + Logout Se déconnecter @@ -3638,7 +3643,7 @@ Please select a new order. - + Show Montrer @@ -3653,7 +3658,7 @@ Please select a new order. Ouvrir - + Disclaimer and ToS Clause de non-responsabilité et conditions d'utilisation @@ -3694,12 +3699,12 @@ Please select a new order. Taux CEX - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 n'est pas activé - Souhaitez vous l'activer pour pouvoir selectionnez les meilleurs offres %2 ?<br><a href='#'>Oui</a> - <a href='#no'>Non</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4173,37 +4178,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. Aucun ordre d'achat trouvé pour %1. - + You can check later or try to sell a different coin. Vous pouvez vérifier plus tard ou essayer de vendre un actif différent. - + Calculating fee estimate... - + Total %1 fees: Frais totaux %1 : - + %2 (%3) @@ -4520,7 +4530,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts index f4369b0c9b..bca0ddeeae 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts @@ -3558,12 +3558,17 @@ Please select a new order. - + + Reuse static RPC password + + + + Application Version - + copied to clipboard скопировано в буфер @@ -3593,47 +3598,47 @@ Please select a new order. Спрашивать системный пароль перед отправкой монет? (2FA) - + Application version Версия приложения - + MM2 version Версия MM2 - + MM2 Version Версия MM2 - + MM2 Version copied to clipboard. Версия MM2 скопирована в буфер обмена. - + Qt version Версия Qt - + Qt Version Версия Qt - + Qt Version copied to clipboard. Версия Qt скопирована в буфер обмена. - + Search Update Проверить на обновления - + Logout Выход @@ -3644,7 +3649,7 @@ Please select a new order. - + Show Показать @@ -3659,7 +3664,7 @@ Please select a new order. Установить - + Disclaimer and ToS Дисклеймер и Условия Использования @@ -3700,12 +3705,12 @@ Please select a new order. CEX цена - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 не активирован -Вы хотите активировать этот %2 актив чтобы видеть лучшие ордеры для него ?<br><a href='#'>Да</a> - <a href='#no'>Нет</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4177,37 +4182,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. Не найдено ордеров на покупку дл] %1. - + You can check later or try to sell a different coin. Вы можете попробовать позже или попробовать продать другой актив. - + Calculating fee estimate... - + Total %1 fees: Всего %1 комиссий: - + %2 (%3) %2 (%3) @@ -4524,7 +4534,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts index 79b1325274..6b3fca8014 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts @@ -3546,12 +3546,17 @@ Please select a new order. - + + Reuse static RPC password + + + + Application Version - + copied to clipboard @@ -3581,47 +3586,47 @@ Please select a new order. Para göndermeden önce sistem parolası sorulsun mu ? (2FA) - + Application version Uygulama sürümü - + MM2 version MM2 sürümü - + MM2 Version - + MM2 Version copied to clipboard. - + Qt version Qt sürümü - + Qt Version - + Qt Version copied to clipboard. - + Search Update Güncelleme Ara - + Logout Çıkış @@ -3632,7 +3637,7 @@ Please select a new order. - + Show Göster @@ -3647,7 +3652,7 @@ Please select a new order. Aç - + Disclaimer and ToS Sorumluluk Reddi ve K.Ş. @@ -3688,12 +3693,12 @@ Please select a new order. CEX Oranı - + %1 is not enabled - Do you want to enable it to be able to select %2 best orders ?<br><a href='#'>Yes</a> - <a href='#no'>No</a> %1 etkin değil - En iyi %2 siparişini seçebilmesi için etkinleştirmek istiyor musunuz ? <br><a href='#'>Evet</a> - <a href='#no'>Hayır</a> - + %1 is not enabled - Please enable it through the coin activation menu @@ -4165,37 +4170,42 @@ There is a toggle in settings where you can turn on/off the display of these tra - + Search coins - - Show only enabled coins + + Min Value + + + + + Hide disabled coins - + No buy orders found for %1. - + You can check later or try to sell a different coin. - + Calculating fee estimate... - + Total %1 fees: Toplam %1 işlem giderleri: - + %2 (%3) %2 (%3) @@ -4512,7 +4522,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/src/core/atomicdex/api/mm2/balance_info.cpp b/src/core/atomicdex/api/mm2/balance_info.cpp index dde88b26a0..00865a30f3 100644 --- a/src/core/atomicdex/api/mm2/balance_info.cpp +++ b/src/core/atomicdex/api/mm2/balance_info.cpp @@ -1,6 +1,6 @@ #include -#include "balance_info.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/generics.cpp b/src/core/atomicdex/api/mm2/generics.cpp index ebb50d9598..2a16589c28 100644 --- a/src/core/atomicdex/api/mm2/generics.cpp +++ b/src/core/atomicdex/api/mm2/generics.cpp @@ -19,7 +19,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc2.best.orders.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" #include "atomicdex/api/mm2/rpc.buy.hpp" #include "atomicdex/api/mm2/rpc.convertaddress.hpp" #include "atomicdex/api/mm2/rpc.disable.hpp" diff --git a/src/core/atomicdex/api/mm2/get_public_key_rpc.hpp b/src/core/atomicdex/api/mm2/get_public_key_rpc.hpp index fefb0235e2..6f9c8e1aca 100644 --- a/src/core/atomicdex/api/mm2/get_public_key_rpc.hpp +++ b/src/core/atomicdex/api/mm2/get_public_key_rpc.hpp @@ -22,7 +22,7 @@ #include -#include "rpc.hpp" +#include "atomicdex/api/mm2/rpc.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/mm2.client.cpp b/src/core/atomicdex/api/mm2/mm2.client.cpp index 3dd79528fe..73d7e905c1 100644 --- a/src/core/atomicdex/api/mm2/mm2.client.cpp +++ b/src/core/atomicdex/api/mm2/mm2.client.cpp @@ -18,18 +18,18 @@ #include -#include "enable_slp_rpc.hpp" +#include "mm2.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "mm2.client.hpp" +#include "atomicdex/constants/dex.constants.hpp" #include "get_public_key_rpc.hpp" -#include "enable_bch_with_tokens_rpc.hpp" #include "my_tx_history_rpc.hpp" #include "my_tx_history_v1_rpc.hpp" -#include "mm2.client.hpp" -#include "mm2.hpp" -#include "atomicdex/constants/dex.constants.hpp" -#include "rpc.hpp" #include "rpc.tx.history.hpp" -#include "rpc2.enable_tendermint_token.hpp" -#include "rpc2.enable_tendermint_with_assets.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp" namespace { diff --git a/src/core/atomicdex/api/mm2/mm2.client.hpp b/src/core/atomicdex/api/mm2/mm2.client.hpp index 26a6b92672..927257dcc4 100644 --- a/src/core/atomicdex/api/mm2/mm2.client.hpp +++ b/src/core/atomicdex/api/mm2/mm2.client.hpp @@ -10,8 +10,8 @@ #include "atomicdex/utilities/cpprestsdk.utilities.hpp" #include "rpc.disable.hpp" #include "rpc.recover.funds.hpp" -#include "rpc.hpp" -#include "rpc2.task.enable_z_coin.cancel.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/mm2.cpp b/src/core/atomicdex/api/mm2/mm2.cpp index f18b4cf6e3..15e1dcb0a2 100644 --- a/src/core/atomicdex/api/mm2/mm2.cpp +++ b/src/core/atomicdex/api/mm2/mm2.cpp @@ -19,15 +19,15 @@ //! Project Headers #include "atomicdex/api/mm2/mm2.hpp" -#include "atomicdex/api/mm2/rpc2.best.orders.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" #include "atomicdex/api/mm2/rpc.convertaddress.hpp" #include "atomicdex/api/mm2/rpc.min.volume.hpp" #include "atomicdex/api/mm2/rpc.orderbook.hpp" #include "atomicdex/api/mm2/rpc.recover.funds.hpp" #include "atomicdex/api/mm2/rpc.trade.preimage.hpp" #include "atomicdex/api/mm2/rpc.validate.address.hpp" -#include "atomicdex/api/mm2/rpc2.withdraw.hpp" -#include "atomicdex/api/mm2/rpc2.task.withdraw.status.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp" #include "atomicdex/api/mm2/rpc.recover.funds.hpp" #include "atomicdex/pages/qt.settings.page.hpp" #include "atomicdex/services/price/global.provider.hpp" diff --git a/src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp b/src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp index bc7e6e1c94..72d4c811fb 100644 --- a/src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp +++ b/src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp @@ -3,9 +3,9 @@ #include -#include "paging_options.hpp" -#include "transaction.data.hpp" -#include "rpc.hpp" +#include "atomicdex/api/mm2/paging_options.hpp" +#include "atomicdex/api/mm2/transaction.data.hpp" +#include "atomicdex/api/mm2/rpc.hpp" #pragma once diff --git a/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp b/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp index 1ff69bcc08..8ff5a01c38 100644 --- a/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp +++ b/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp @@ -3,7 +3,7 @@ #pragma once -#include "rpc.hpp" +#include "atomicdex/api/mm2/rpc.hpp" #include "rpc.tx.history.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/paging_options.cpp b/src/core/atomicdex/api/mm2/paging_options.cpp index 91e2c9b834..95943a77ec 100644 --- a/src/core/atomicdex/api/mm2/paging_options.cpp +++ b/src/core/atomicdex/api/mm2/paging_options.cpp @@ -3,7 +3,7 @@ #include -#include "paging_options.hpp" +#include "atomicdex/api/mm2/paging_options.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.cpp b/src/core/atomicdex/api/mm2/rpc.cpp index af7f8abae3..a5a2786a78 100644 --- a/src/core/atomicdex/api/mm2/rpc.cpp +++ b/src/core/atomicdex/api/mm2/rpc.cpp @@ -1,6 +1,6 @@ #include -#include "rpc.hpp" +#include "atomicdex/api/mm2/rpc.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.tx.history.hpp b/src/core/atomicdex/api/mm2/rpc.tx.history.hpp index 6d287258aa..900290bead 100644 --- a/src/core/atomicdex/api/mm2/rpc.tx.history.hpp +++ b/src/core/atomicdex/api/mm2/rpc.tx.history.hpp @@ -5,8 +5,8 @@ #include -#include "transaction.data.hpp" -#include "paging_options.hpp" +#include "atomicdex/api/mm2/transaction.data.hpp" +#include "atomicdex/api/mm2/paging_options.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc2.best.orders.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.best.orders.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.best.orders.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.best.orders.cpp index c2b4955d89..ebab6c03bd 100644 --- a/src/core/atomicdex/api/mm2/rpc2.best.orders.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.best.orders.cpp @@ -23,7 +23,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc2.best.orders.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" //! Implementation RPC [best_orders] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.best.orders.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.best.orders.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp diff --git a/src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.cpp index 26b248f4a1..0b0529952d 100644 --- a/src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.cpp @@ -1,6 +1,6 @@ #include -#include "enable_bch_with_tokens_rpc.hpp" +#include "rpc2.enable_bch_with_tokens_rpc.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp similarity index 97% rename from src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp index 88f8f66cd7..dc74ce6b93 100644 --- a/src/core/atomicdex/api/mm2/enable_bch_with_tokens_rpc.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp @@ -2,8 +2,8 @@ #include -#include "rpc.hpp" -#include "balance_info.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" #include "atomicdex/config/electrum.cfg.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/enable_slp_rpc.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.cpp similarity index 95% rename from src/core/atomicdex/api/mm2/enable_slp_rpc.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.cpp index 82f1524d94..813fca85f0 100644 --- a/src/core/atomicdex/api/mm2/enable_slp_rpc.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.cpp @@ -1,6 +1,6 @@ #include -#include "enable_slp_rpc.hpp" +#include "rpc2.enable_slp_rpc.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/enable_slp_rpc.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp similarity index 96% rename from src/core/atomicdex/api/mm2/enable_slp_rpc.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp index f3bce14e44..33a961cee0 100644 --- a/src/core/atomicdex/api/mm2/enable_slp_rpc.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp @@ -22,8 +22,8 @@ #include //> nlohmann::json -#include "rpc.hpp" -#include "balance_info.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_token.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.cpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.enable_tendermint_token.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.cpp diff --git a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_token.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp similarity index 96% rename from src/core/atomicdex/api/mm2/rpc2.enable_tendermint_token.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp index a41920ad3d..09b6c5d486 100644 --- a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_token.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp @@ -21,8 +21,8 @@ #include //> nlohmann::json -#include "rpc.hpp" -#include "balance_info.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.cpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.cpp diff --git a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp similarity index 96% rename from src/core/atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp index c65408658f..22aed96a49 100644 --- a/src/core/atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp @@ -2,8 +2,8 @@ #include -#include "rpc.hpp" -#include "balance_info.hpp" +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" #include "atomicdex/config/electrum.cfg.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.cpp similarity index 96% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.cpp index 1c2a90f384..1b78ed6a62 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp" //! Implementation 2.0 RPC [enable_z_coin_cancel] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp index fa6976dfc3..7736cd4dd8 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.cancel.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp @@ -23,7 +23,7 @@ #include //! Project Headers -#include "generic.error.hpp" +#include "atomicdex/api/mm2/generic.error.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.init.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.cpp similarity index 97% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.init.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.cpp index 3b826d086f..330351e3f4 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.init.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.task.enable_z_coin.init.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.hpp" //! Implementation 2.0 RPC [enable_z_coin] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.init.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.init.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.hpp diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.cpp index eff12d0753..4ab759e7df 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.task.enable_z_coin.status.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.hpp" //! Implementation 2.0 RPC [enable_z_coin_status] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.hpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.hpp index e55735448f..cc66b70111 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.enable_z_coin.status.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.hpp @@ -23,7 +23,7 @@ #include //! Project Headers -#include "generic.error.hpp" +#include "atomicdex/api/mm2/generic.error.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.init.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.cpp similarity index 97% rename from src/core/atomicdex/api/mm2/rpc2.task.withdraw.init.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.cpp index 29d44086fe..d78b016255 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.init.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.task.withdraw.init.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.hpp" //! Implementation 2.0 RPC [withdraw_init] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.init.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.task.withdraw.init.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.hpp diff --git a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.status.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.cpp similarity index 96% rename from src/core/atomicdex/api/mm2/rpc2.task.withdraw.status.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.cpp index 9df0b7b0af..6603c58bc5 100644 --- a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.status.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.task.withdraw.status.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp" //! Implementation 2.0 RPC [withdraw_status] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.task.withdraw.status.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.task.withdraw.status.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp diff --git a/src/core/atomicdex/api/mm2/rpc2.withdraw.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.withdraw.cpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.withdraw.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.withdraw.cpp diff --git a/src/core/atomicdex/api/mm2/rpc2.withdraw.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc2.withdraw.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp diff --git a/src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.cpp index 0ae2232e10..5e4af99af6 100644 --- a/src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.z_coin_tx_history.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp" //! Implementation 2.0 RPC [z_coin_tx_history] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp index 60c07671de..4a2523f7f7 100644 --- a/src/core/atomicdex/api/mm2/rpc2.z_coin_tx_history.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp @@ -24,7 +24,7 @@ #include //! Our Headers -#include "transaction.data.hpp" +#include "atomicdex/api/mm2/transaction.data.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/pages/qt.wallet.page.cpp b/src/core/atomicdex/pages/qt.wallet.page.cpp index f916f68cd6..2aaa598860 100644 --- a/src/core/atomicdex/pages/qt.wallet.page.cpp +++ b/src/core/atomicdex/pages/qt.wallet.page.cpp @@ -14,9 +14,9 @@ #include "atomicdex/api/mm2/rpc.convertaddress.hpp" #include "atomicdex/api/mm2/rpc.electrum.hpp" #include "atomicdex/api/mm2/rpc.validate.address.hpp" -#include "atomicdex/api/mm2/rpc2.withdraw.hpp" -#include "atomicdex/api/mm2/rpc2.task.withdraw.init.hpp" -#include "atomicdex/api/mm2/rpc2.task.withdraw.status.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp" #include "atomicdex/services/mm2/mm2.service.hpp" #include "atomicdex/services/price/global.provider.hpp" #include "atomicdex/services/price/komodo_prices/komodo.prices.provider.hpp" diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index 92738cc754..1c74172074 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -31,9 +31,9 @@ #include "atomicdex/api/mm2/rpc.enable.hpp" #include "atomicdex/api/mm2/rpc.min.volume.hpp" #include "atomicdex/api/mm2/rpc.tx.history.hpp" -#include "atomicdex/api/mm2/rpc2.z_coin_tx_history.hpp" -#include "atomicdex/api/mm2/rpc2.task.enable_z_coin.init.hpp" -#include "atomicdex/api/mm2/rpc2.task.enable_z_coin.status.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.status.hpp" #include "atomicdex/config/mm2.cfg.hpp" #include "atomicdex/config/coins.cfg.hpp" #include "atomicdex/constants/dex.constants.hpp" diff --git a/src/core/atomicdex/services/mm2/mm2.service.hpp b/src/core/atomicdex/services/mm2/mm2.service.hpp index 60d479c845..c6a325ecc7 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.hpp +++ b/src/core/atomicdex/services/mm2/mm2.service.hpp @@ -35,10 +35,10 @@ #include "atomicdex/api/mm2/rpc.max.taker.vol.hpp" #include "atomicdex/api/mm2/rpc.min.volume.hpp" #include "atomicdex/api/mm2/rpc.orderbook.hpp" -#include "atomicdex/api/mm2/enable_bch_with_tokens_rpc.hpp" -#include "atomicdex/api/mm2/enable_slp_rpc.hpp" -#include "atomicdex/api/mm2/rpc2.enable_tendermint_with_assets.hpp" -#include "atomicdex/api/mm2/rpc2.enable_tendermint_token.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp" #include "atomicdex/config/raw.mm2.coins.cfg.hpp" #include "atomicdex/constants/dex.constants.hpp" #include "atomicdex/data/dex/orders.and.swaps.data.hpp" diff --git a/src/core/atomicdex/services/price/orderbook.scanner.service.cpp b/src/core/atomicdex/services/price/orderbook.scanner.service.cpp index 75950311ad..634d8ad945 100644 --- a/src/core/atomicdex/services/price/orderbook.scanner.service.cpp +++ b/src/core/atomicdex/services/price/orderbook.scanner.service.cpp @@ -15,7 +15,7 @@ ******************************************************************************/ //! Project Headers -#include "atomicdex/api/mm2/rpc2.best.orders.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" #include "atomicdex/pages/qt.trading.page.hpp" #include "atomicdex/services/mm2/mm2.service.hpp" #include "atomicdex/services/price/orderbook.scanner.service.hpp" diff --git a/src/core/atomicdex/services/price/orderbook.scanner.service.hpp b/src/core/atomicdex/services/price/orderbook.scanner.service.hpp index 481aee9a13..528ddcd905 100644 --- a/src/core/atomicdex/services/price/orderbook.scanner.service.hpp +++ b/src/core/atomicdex/services/price/orderbook.scanner.service.hpp @@ -22,7 +22,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc2.best.orders.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" //! Namespace declaration namespace atomic_dex diff --git a/src/tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp b/src/tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp index e11678a5c8..625c9e65bf 100644 --- a/src/tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp +++ b/src/tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp @@ -1,6 +1,6 @@ #include -#include "atomicdex/api/mm2/enable_bch_with_tokens_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp" TEST_CASE("enable_bch_with_tokens_request_rpc serialization") { From 4c4e2046d72e06c949fb4f942a9430aff072c9fc Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 15 Dec 2023 17:58:22 +0800 Subject: [PATCH 2/4] update rpc method paths --- src/CMakeLists.txt | 4 +- src/core/atomicdex/api/mm2/generics.cpp | 18 ++++---- src/core/atomicdex/api/mm2/mm2.client.cpp | 8 ++-- src/core/atomicdex/api/mm2/mm2.client.hpp | 4 +- src/core/atomicdex/api/mm2/mm2.cpp | 15 +++---- .../atomicdex/api/mm2/rpc.get.public.key.hpp | 45 ------------------- .../api/mm2/{ => rpc_v1}/rpc.buy.cpp | 2 +- .../api/mm2/{ => rpc_v1}/rpc.buy.hpp | 0 .../mm2/{ => rpc_v1}/rpc.convertaddress.cpp | 2 +- .../mm2/{ => rpc_v1}/rpc.convertaddress.hpp | 0 .../rpc.disable_coin.cpp} | 2 +- .../rpc.disable_coin.hpp} | 0 .../api/mm2/{ => rpc_v1}/rpc.electrum.cpp | 2 +- .../api/mm2/{ => rpc_v1}/rpc.electrum.hpp | 0 .../api/mm2/{ => rpc_v1}/rpc.enable.cpp | 2 +- .../api/mm2/{ => rpc_v1}/rpc.enable.hpp | 0 .../rpc.max_taker_vol.cpp} | 2 +- .../rpc.max_taker_vol.hpp} | 0 .../rpc.min_trading_vol.cpp} | 2 +- .../rpc.min_trading_vol.hpp} | 2 +- .../rpc.my_balance.cpp} | 2 +- .../rpc.my_balance.hpp} | 0 .../rpc.my_tx_history.hpp} | 2 +- .../rpc.recover_funds_of_swap.cpp} | 2 +- .../rpc.recover_funds_of_swap.hpp} | 0 .../api/mm2/{ => rpc_v1}/rpc.sell.cpp | 2 +- .../api/mm2/{ => rpc_v1}/rpc.sell.hpp | 0 .../api/mm2/{ => rpc_v1}/rpc.setprice.cpp | 2 +- .../api/mm2/{ => rpc_v1}/rpc.setprice.hpp | 0 .../rpc.update_maker_order.cpp} | 2 +- .../rpc.update_maker_order.hpp} | 0 .../rpc.validateaddress.cpp} | 2 +- .../rpc.validateaddress.hpp} | 0 .../rpc2.get_public_key.cpp} | 2 +- .../rpc2.get_public_key.hpp} | 0 .../rpc2.my_tx_history.cpp} | 2 +- .../rpc2.my_tx_history.hpp} | 0 .../rpc2.orderbook.cpp} | 2 +- .../rpc2.orderbook.hpp} | 0 .../rpc2.trade_preimage.cpp} | 2 +- .../rpc2.trade_preimage.fwd.hpp} | 0 .../rpc2.trade_preimage.hpp} | 0 .../atomicdex/models/qt.orderbook.model.hpp | 2 +- src/core/atomicdex/models/qt.orders.model.cpp | 2 +- src/core/atomicdex/pages/qt.settings.page.cpp | 2 +- src/core/atomicdex/pages/qt.trading.page.cpp | 8 ++-- src/core/atomicdex/pages/qt.wallet.page.cpp | 6 +-- .../internet/internet.checker.service.cpp | 6 +-- .../mm2/auto.update.maker.order.service.cpp | 2 +- .../atomicdex/services/mm2/mm2.service.cpp | 6 +-- .../atomicdex/services/mm2/mm2.service.hpp | 8 ++-- ....cpp => mm2.rpc2.trade_preimage.tests.cpp} | 6 +-- 52 files changed, 66 insertions(+), 114 deletions(-) delete mode 100644 src/core/atomicdex/api/mm2/rpc.get.public.key.hpp rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.buy.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.buy.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.convertaddress.cpp (92%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.convertaddress.hpp (100%) rename src/core/atomicdex/api/mm2/{rpc.disable.cpp => rpc_v1/rpc.disable_coin.cpp} (91%) rename src/core/atomicdex/api/mm2/{rpc.disable.hpp => rpc_v1/rpc.disable_coin.hpp} (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.electrum.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.electrum.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.enable.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.enable.hpp (100%) rename src/core/atomicdex/api/mm2/{rpc.max.taker.vol.cpp => rpc_v1/rpc.max_taker_vol.cpp} (98%) rename src/core/atomicdex/api/mm2/{rpc.max.taker.vol.hpp => rpc_v1/rpc.max_taker_vol.hpp} (100%) rename src/core/atomicdex/api/mm2/{rpc.min.volume.cpp => rpc_v1/rpc.min_trading_vol.cpp} (92%) rename src/core/atomicdex/api/mm2/{rpc.min.volume.hpp => rpc_v1/rpc.min_trading_vol.hpp} (95%) rename src/core/atomicdex/api/mm2/{rpc.balance.cpp => rpc_v1/rpc.my_balance.cpp} (96%) rename src/core/atomicdex/api/mm2/{rpc.balance.hpp => rpc_v1/rpc.my_balance.hpp} (100%) rename src/core/atomicdex/api/mm2/{my_tx_history_v1_rpc.hpp => rpc_v1/rpc.my_tx_history.hpp} (94%) rename src/core/atomicdex/api/mm2/{rpc.recover.funds.cpp => rpc_v1/rpc.recover_funds_of_swap.cpp} (93%) rename src/core/atomicdex/api/mm2/{rpc.recover.funds.hpp => rpc_v1/rpc.recover_funds_of_swap.hpp} (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.sell.cpp (98%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.sell.hpp (100%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.setprice.cpp (97%) rename src/core/atomicdex/api/mm2/{ => rpc_v1}/rpc.setprice.hpp (100%) rename src/core/atomicdex/api/mm2/{rpc.update.maker.order.cpp => rpc_v1/rpc.update_maker_order.cpp} (94%) rename src/core/atomicdex/api/mm2/{rpc.update.maker.order.hpp => rpc_v1/rpc.update_maker_order.hpp} (100%) rename src/core/atomicdex/api/mm2/{rpc.validate.address.cpp => rpc_v1/rpc.validateaddress.cpp} (92%) rename src/core/atomicdex/api/mm2/{rpc.validate.address.hpp => rpc_v1/rpc.validateaddress.hpp} (100%) rename src/core/atomicdex/api/mm2/{get_public_key_rpc.cpp => rpc_v2/rpc2.get_public_key.cpp} (96%) rename src/core/atomicdex/api/mm2/{get_public_key_rpc.hpp => rpc_v2/rpc2.get_public_key.hpp} (100%) rename src/core/atomicdex/api/mm2/{my_tx_history_rpc.cpp => rpc_v2/rpc2.my_tx_history.cpp} (93%) rename src/core/atomicdex/api/mm2/{my_tx_history_rpc.hpp => rpc_v2/rpc2.my_tx_history.hpp} (100%) rename src/core/atomicdex/api/mm2/{rpc.orderbook.cpp => rpc_v2/rpc2.orderbook.cpp} (99%) rename src/core/atomicdex/api/mm2/{rpc.orderbook.hpp => rpc_v2/rpc2.orderbook.hpp} (100%) rename src/core/atomicdex/api/mm2/{rpc.trade.preimage.cpp => rpc_v2/rpc2.trade_preimage.cpp} (97%) rename src/core/atomicdex/api/mm2/{rpc.trade.preimage.fwd.hpp => rpc_v2/rpc2.trade_preimage.fwd.hpp} (100%) rename src/core/atomicdex/api/mm2/{rpc.trade.preimage.hpp => rpc_v2/rpc2.trade_preimage.hpp} (100%) rename src/tests/api/mm2/{mm2.rpc.trade.preimage.tests.cpp => mm2.rpc2.trade_preimage.tests.cpp} (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 70769cbc6a..0bbc1a0a12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,7 +117,7 @@ add_executable(${PROJECT_NAME}_tests MACOSX_BUNDLE ${ICON} tests/api/mm2/mm2.api.utxo.merge.params.tests.cpp tests/api/mm2/mm2.api.balance.infos.tests.cpp tests/api/mm2/mm2.fraction.tests.cpp - tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp + tests/api/mm2/mm2.rpc2.trade_preimage.tests.cpp ##! CFG tests/config/coins.cfg.tests.cpp @@ -125,7 +125,7 @@ add_executable(${PROJECT_NAME}_tests MACOSX_BUNDLE ${ICON} ##! API tests/api/coingecko/coingecko.tests.cpp tests/api/komodo_prices/komodo.prices.tests.cpp - tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp + tests/api/mm2/mm2.rpc2.trade_preimage.tests.cpp tests/api/mm2/mm2.fraction.tests.cpp tests/api/mm2/enable_bch_with_tokens_rpc_tests.cpp diff --git a/src/core/atomicdex/api/mm2/generics.cpp b/src/core/atomicdex/api/mm2/generics.cpp index 2a16589c28..19e4288df0 100644 --- a/src/core/atomicdex/api/mm2/generics.cpp +++ b/src/core/atomicdex/api/mm2/generics.cpp @@ -19,16 +19,16 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.buy.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.disable_coin.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.sell.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" -#include "atomicdex/api/mm2/rpc.buy.hpp" -#include "atomicdex/api/mm2/rpc.convertaddress.hpp" -#include "atomicdex/api/mm2/rpc.disable.hpp" -#include "atomicdex/api/mm2/rpc.max.taker.vol.hpp" -#include "atomicdex/api/mm2/rpc.min.volume.hpp" -#include "atomicdex/api/mm2/rpc.sell.hpp" -#include "atomicdex/api/mm2/rpc.trade.preimage.hpp" -#include "atomicdex/api/mm2/rpc.validate.address.hpp" -#include "atomicdex/api/mm2/rpc.recover.funds.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/mm2.client.cpp b/src/core/atomicdex/api/mm2/mm2.client.cpp index 73d7e905c1..385376eecd 100644 --- a/src/core/atomicdex/api/mm2/mm2.client.cpp +++ b/src/core/atomicdex/api/mm2/mm2.client.cpp @@ -21,11 +21,11 @@ #include "mm2.hpp" #include "atomicdex/api/mm2/rpc.hpp" #include "mm2.client.hpp" -#include "atomicdex/constants/dex.constants.hpp" -#include "get_public_key_rpc.hpp" -#include "my_tx_history_rpc.hpp" -#include "my_tx_history_v1_rpc.hpp" #include "rpc.tx.history.hpp" +#include "atomicdex/constants/dex.constants.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.my_tx_history.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_token.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp" diff --git a/src/core/atomicdex/api/mm2/mm2.client.hpp b/src/core/atomicdex/api/mm2/mm2.client.hpp index 927257dcc4..13421d986d 100644 --- a/src/core/atomicdex/api/mm2/mm2.client.hpp +++ b/src/core/atomicdex/api/mm2/mm2.client.hpp @@ -8,8 +8,8 @@ // Project Headers #include "atomicdex/utilities/cpprestsdk.utilities.hpp" -#include "rpc.disable.hpp" -#include "rpc.recover.funds.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.disable_coin.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp" #include "atomicdex/api/mm2/rpc.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.cancel.hpp" diff --git a/src/core/atomicdex/api/mm2/mm2.cpp b/src/core/atomicdex/api/mm2/mm2.cpp index 15e1dcb0a2..62aefed3cd 100644 --- a/src/core/atomicdex/api/mm2/mm2.cpp +++ b/src/core/atomicdex/api/mm2/mm2.cpp @@ -19,16 +19,15 @@ //! Project Headers #include "atomicdex/api/mm2/mm2.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.best.orders.hpp" -#include "atomicdex/api/mm2/rpc.convertaddress.hpp" -#include "atomicdex/api/mm2/rpc.min.volume.hpp" -#include "atomicdex/api/mm2/rpc.orderbook.hpp" -#include "atomicdex/api/mm2/rpc.recover.funds.hpp" -#include "atomicdex/api/mm2/rpc.trade.preimage.hpp" -#include "atomicdex/api/mm2/rpc.validate.address.hpp" -#include "atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp" -#include "atomicdex/api/mm2/rpc.recover.funds.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp" #include "atomicdex/pages/qt.settings.page.hpp" #include "atomicdex/services/price/global.provider.hpp" #include "atomicdex/utilities/global.utilities.hpp" diff --git a/src/core/atomicdex/api/mm2/rpc.get.public.key.hpp b/src/core/atomicdex/api/mm2/rpc.get.public.key.hpp deleted file mode 100644 index e7afee1abf..0000000000 --- a/src/core/atomicdex/api/mm2/rpc.get.public.key.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/****************************************************************************** - * Copyright © 2013-2022 The Komodo Platform Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * Komodo Platform software, including this file may be copied, modified, * - * propagated or distributed except according to the terms contained in the * - * LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#pragma once - -// Std Headers -#include - -// Deps Headers -#include - -namespace atomic_dex::mm2 -{ - struct get_public_key - { - static constexpr auto endpoint = "get_public_key"; - static constexpr bool is_v2 = true; - struct expected_request_type - { - - } request; - struct expected_answer_type - { - std::string public_key; - } answer; - }; - using get_public_key_request = get_public_key::expected_request_type; - using get_public_key_answer = get_public_key::expected_answer_type; - - inline void to_json([[maybe_unused]] nlohmann::json& j, const get_public_key_request&) { } - void from_json(const nlohmann::json& json, get_public_key_answer& in); -} \ No newline at end of file diff --git a/src/core/atomicdex/api/mm2/rpc.buy.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc.buy.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.cpp index 09002a24f6..cfbd8008ca 100644 --- a/src/core/atomicdex/api/mm2/rpc.buy.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.cpp @@ -20,7 +20,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.buy.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.buy.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.buy.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.buy.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.buy.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.convertaddress.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.convertaddress.cpp similarity index 92% rename from src/core/atomicdex/api/mm2/rpc.convertaddress.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.convertaddress.cpp index 02dd0b5b71..333a76b46c 100644 --- a/src/core/atomicdex/api/mm2/rpc.convertaddress.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.convertaddress.cpp @@ -6,7 +6,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.convertaddress.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp" #include "atomicdex/api/mm2/generics.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.convertaddress.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.convertaddress.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.disable.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.disable_coin.cpp similarity index 91% rename from src/core/atomicdex/api/mm2/rpc.disable.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.disable_coin.cpp index 2317bcfb77..8de2611550 100644 --- a/src/core/atomicdex/api/mm2/rpc.disable.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.disable_coin.cpp @@ -6,7 +6,7 @@ //! #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.disable.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.disable_coin.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.disable.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.disable_coin.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.disable.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.disable_coin.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.electrum.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.electrum.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc.electrum.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.electrum.cpp index 9ac193efba..58483e264e 100644 --- a/src/core/atomicdex/api/mm2/rpc.electrum.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.electrum.cpp @@ -18,7 +18,7 @@ #include //! Project Deps -#include "atomicdex/api/mm2/rpc.electrum.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.electrum.hpp" //! Implementation RPC [electrum] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.electrum.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.electrum.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.electrum.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.electrum.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.enable.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.enable.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc.enable.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.enable.cpp index 845694e8de..52a775e424 100644 --- a/src/core/atomicdex/api/mm2/rpc.enable.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.enable.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.enable.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.enable.hpp" //! Implementation RPC [enable] namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.enable.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.enable.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.enable.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.enable.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.max.taker.vol.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc.max.taker.vol.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.cpp index c5f666a061..9021091c33 100644 --- a/src/core/atomicdex/api/mm2/rpc.max.taker.vol.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.cpp @@ -19,7 +19,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.max.taker.vol.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.hpp" #include "atomicdex/utilities/global.utilities.hpp" //! Implementation RPC [max_taker_vol] diff --git a/src/core/atomicdex/api/mm2/rpc.max.taker.vol.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.max.taker.vol.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.min.volume.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.cpp similarity index 92% rename from src/core/atomicdex/api/mm2/rpc.min.volume.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.cpp index 392813a3c8..c26141fc40 100644 --- a/src/core/atomicdex/api/mm2/rpc.min.volume.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.cpp @@ -3,7 +3,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.min.volume.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.min.volume.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp similarity index 95% rename from src/core/atomicdex/api/mm2/rpc.min.volume.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp index 3909384cd5..1cb5fd8a45 100644 --- a/src/core/atomicdex/api/mm2/rpc.min.volume.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp @@ -11,7 +11,7 @@ //! Deps #include -#include "atomicdex/api/mm2/rpc.min.volume.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.balance.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.my_balance.cpp similarity index 96% rename from src/core/atomicdex/api/mm2/rpc.balance.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.my_balance.cpp index 02e85451e4..6d0c3b7e27 100644 --- a/src/core/atomicdex/api/mm2/rpc.balance.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.my_balance.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.balance.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.my_balance.hpp" #include "atomicdex/utilities/global.utilities.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.balance.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.my_balance.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.balance.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.my_balance.hpp diff --git a/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.my_tx_history.hpp similarity index 94% rename from src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.my_tx_history.hpp index 8ff5a01c38..1da0cebe99 100644 --- a/src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.my_tx_history.hpp @@ -4,7 +4,7 @@ #pragma once #include "atomicdex/api/mm2/rpc.hpp" -#include "rpc.tx.history.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.my_tx_history.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.recover.funds.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.cpp similarity index 93% rename from src/core/atomicdex/api/mm2/rpc.recover.funds.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.cpp index e2a69f41fd..6ca1f0000a 100644 --- a/src/core/atomicdex/api/mm2/rpc.recover.funds.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.cpp @@ -6,7 +6,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.recover.funds.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.recover.funds.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.recover.funds.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.sell.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.cpp similarity index 98% rename from src/core/atomicdex/api/mm2/rpc.sell.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.cpp index 8784dd5a1f..a39a17eace 100644 --- a/src/core/atomicdex/api/mm2/rpc.sell.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.cpp @@ -20,7 +20,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.sell.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.sell.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.sell.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.sell.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.sell.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.setprice.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.setprice.cpp similarity index 97% rename from src/core/atomicdex/api/mm2/rpc.setprice.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.setprice.cpp index 2b300d28dd..85cd7cffc9 100644 --- a/src/core/atomicdex/api/mm2/rpc.setprice.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.setprice.cpp @@ -17,7 +17,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.setprice.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.setprice.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.setprice.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.setprice.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.setprice.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.setprice.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.update.maker.order.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.cpp similarity index 94% rename from src/core/atomicdex/api/mm2/rpc.update.maker.order.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.cpp index cd90e60f70..e7cae487c8 100644 --- a/src/core/atomicdex/api/mm2/rpc.update.maker.order.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.cpp @@ -6,7 +6,7 @@ #include //! Project Headers -#include +#include namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.update.maker.order.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.update.maker.order.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.validate.address.cpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.validateaddress.cpp similarity index 92% rename from src/core/atomicdex/api/mm2/rpc.validate.address.cpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.validateaddress.cpp index 52a888967b..e30274b0df 100644 --- a/src/core/atomicdex/api/mm2/rpc.validate.address.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v1/rpc.validateaddress.cpp @@ -1,6 +1,6 @@ #include -#include "atomicdex/api/mm2/rpc.validate.address.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp" #include "atomicdex/api/mm2/generics.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.validate.address.hpp b/src/core/atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.validate.address.hpp rename to src/core/atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp diff --git a/src/core/atomicdex/api/mm2/get_public_key_rpc.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.cpp similarity index 96% rename from src/core/atomicdex/api/mm2/get_public_key_rpc.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.cpp index fe8559710b..fbcdc33b8d 100644 --- a/src/core/atomicdex/api/mm2/get_public_key_rpc.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.cpp @@ -16,7 +16,7 @@ #include -#include "get_public_key_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/get_public_key_rpc.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/get_public_key_rpc.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp diff --git a/src/core/atomicdex/api/mm2/my_tx_history_rpc.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.cpp similarity index 93% rename from src/core/atomicdex/api/mm2/my_tx_history_rpc.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.cpp index a154fa4a0f..800ffb4cad 100644 --- a/src/core/atomicdex/api/mm2/my_tx_history_rpc.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.cpp @@ -3,7 +3,7 @@ #include -#include "my_tx_history_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.my_tx_history.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.orderbook.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.orderbook.cpp similarity index 99% rename from src/core/atomicdex/api/mm2/rpc.orderbook.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.orderbook.cpp index a76afe8dcb..b97e48f1a8 100644 --- a/src/core/atomicdex/api/mm2/rpc.orderbook.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.orderbook.cpp @@ -18,7 +18,7 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.orderbook.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp" #include "atomicdex/utilities/global.utilities.hpp" namespace atomic_dex::mm2 diff --git a/src/core/atomicdex/api/mm2/rpc.orderbook.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.orderbook.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.trade.preimage.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp similarity index 97% rename from src/core/atomicdex/api/mm2/rpc.trade.preimage.cpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp index b771be7a0d..273bf89cce 100644 --- a/src/core/atomicdex/api/mm2/rpc.trade.preimage.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp @@ -19,7 +19,7 @@ //! Project Headers #include "atomicdex/api/mm2/generics.hpp" -#include "atomicdex/api/mm2/rpc.trade.preimage.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" namespace atomic_dex::mm2 { diff --git a/src/core/atomicdex/api/mm2/rpc.trade.preimage.fwd.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.fwd.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.trade.preimage.fwd.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.fwd.hpp diff --git a/src/core/atomicdex/api/mm2/rpc.trade.preimage.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp similarity index 100% rename from src/core/atomicdex/api/mm2/rpc.trade.preimage.hpp rename to src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp diff --git a/src/core/atomicdex/models/qt.orderbook.model.hpp b/src/core/atomicdex/models/qt.orderbook.model.hpp index 0e74f3d645..269c58a971 100644 --- a/src/core/atomicdex/models/qt.orderbook.model.hpp +++ b/src/core/atomicdex/models/qt.orderbook.model.hpp @@ -27,7 +27,7 @@ #include //! Project -#include "atomicdex/api/mm2/rpc.orderbook.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp" #include "atomicdex/models/qt.orderbook.proxy.model.hpp" namespace atomic_dex diff --git a/src/core/atomicdex/models/qt.orders.model.cpp b/src/core/atomicdex/models/qt.orders.model.cpp index 184c531e06..f9a24767c9 100644 --- a/src/core/atomicdex/models/qt.orders.model.cpp +++ b/src/core/atomicdex/models/qt.orders.model.cpp @@ -19,7 +19,7 @@ #include //! Project -#include "atomicdex/api/mm2/rpc.recover.funds.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.recover_funds_of_swap.hpp" #include "atomicdex/events/qt.events.hpp" #include "atomicdex/models/qt.orders.model.hpp" #include "atomicdex/pages/qt.settings.page.hpp" diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index 9c94beb432..e6af443159 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -25,7 +25,7 @@ #include // Project Headers -#include "atomicdex/api/mm2/get_public_key_rpc.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp" #include "atomicdex/config/enable.cfg.hpp" #include "atomicdex/events/events.hpp" #include "atomicdex/managers/qt.wallet.manager.hpp" diff --git a/src/core/atomicdex/pages/qt.trading.page.cpp b/src/core/atomicdex/pages/qt.trading.page.cpp index 81c02a3106..a4366f9146 100644 --- a/src/core/atomicdex/pages/qt.trading.page.cpp +++ b/src/core/atomicdex/pages/qt.trading.page.cpp @@ -18,9 +18,9 @@ #include //! Project Headers -#include "atomicdex/api/mm2/rpc.buy.hpp" -#include "atomicdex/api/mm2/rpc.sell.hpp" -#include "atomicdex/api/mm2/rpc.trade.preimage.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.buy.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.sell.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" #include "atomicdex/pages/qt.portfolio.page.hpp" #include "atomicdex/pages/qt.settings.page.hpp" #include "atomicdex/pages/qt.trading.page.hpp" @@ -1197,7 +1197,7 @@ namespace atomic_dex }; nlohmann::json batch; - nlohmann::json preimage_request = mm2::template_request("trade_preimage"); + nlohmann::json preimage_request = mm2::template_request("trade_preimage", true); mm2::to_json(preimage_request, req); batch.push_back(preimage_request); preimage_request["userpass"] = "******"; diff --git a/src/core/atomicdex/pages/qt.wallet.page.cpp b/src/core/atomicdex/pages/qt.wallet.page.cpp index 2aaa598860..dc299a6a86 100644 --- a/src/core/atomicdex/pages/qt.wallet.page.cpp +++ b/src/core/atomicdex/pages/qt.wallet.page.cpp @@ -11,9 +11,9 @@ //! Project Headers #include "atomicdex/api/faucet/faucet.hpp" -#include "atomicdex/api/mm2/rpc.convertaddress.hpp" -#include "atomicdex/api/mm2/rpc.electrum.hpp" -#include "atomicdex/api/mm2/rpc.validate.address.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.convertaddress.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.electrum.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.validateaddress.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.withdraw.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.init.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.task.withdraw.status.hpp" diff --git a/src/core/atomicdex/services/internet/internet.checker.service.cpp b/src/core/atomicdex/services/internet/internet.checker.service.cpp index f848c3a6b9..b346ac2853 100644 --- a/src/core/atomicdex/services/internet/internet.checker.service.cpp +++ b/src/core/atomicdex/services/internet/internet.checker.service.cpp @@ -170,11 +170,9 @@ namespace atomic_dex auto& mm2 = this->m_system_manager.get_system(); if (mm2.is_mm2_running()) { - SPDLOG_INFO("mm2 is alive, checking if we are able to fetch a simple orderbook"); + SPDLOG_INFO("mm2 is alive, checking if we are able to fetch mm2 version"); nlohmann::json batch = nlohmann::json::array(); - nlohmann::json current_request = mm2::template_request("orderbook", true); - t_orderbook_request req_orderbook{.base = g_primary_dex_coin, .rel = g_second_primary_dex_coin}; - mm2::to_json(current_request, req_orderbook); + nlohmann::json current_request = mm2::template_request("version"); batch.push_back(current_request); auto async_answer = mm2.get_mm2_client().async_rpc_batch_standalone(batch); generic_treat_answer(async_answer, TO_STD_STR(atomic_dex::g_dex_rpc), &internet_service_checker::is_mm2_endpoint_alive); diff --git a/src/core/atomicdex/services/mm2/auto.update.maker.order.service.cpp b/src/core/atomicdex/services/mm2/auto.update.maker.order.service.cpp index eea078ba52..0e3931fddc 100644 --- a/src/core/atomicdex/services/mm2/auto.update.maker.order.service.cpp +++ b/src/core/atomicdex/services/mm2/auto.update.maker.order.service.cpp @@ -18,7 +18,7 @@ #include // Project Headers -#include "atomicdex/api/mm2/rpc.update.maker.order.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.update_maker_order.hpp" #include "atomicdex/services/mm2/auto.update.maker.order.service.hpp" #include "atomicdex/services/mm2/mm2.service.hpp" #include "atomicdex/services/price/global.provider.hpp" diff --git a/src/core/atomicdex/services/mm2/mm2.service.cpp b/src/core/atomicdex/services/mm2/mm2.service.cpp index 1c74172074..72cc67f0bc 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.cpp +++ b/src/core/atomicdex/services/mm2/mm2.service.cpp @@ -27,9 +27,9 @@ #include #include "atomicdex/api/mm2/utxo.merge.params.hpp" -#include "atomicdex/api/mm2/rpc.electrum.hpp" -#include "atomicdex/api/mm2/rpc.enable.hpp" -#include "atomicdex/api/mm2/rpc.min.volume.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.electrum.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.enable.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" #include "atomicdex/api/mm2/rpc.tx.history.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.z_coin_tx_history.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.task.enable_z_coin.init.hpp" diff --git a/src/core/atomicdex/services/mm2/mm2.service.hpp b/src/core/atomicdex/services/mm2/mm2.service.hpp index c6a325ecc7..53a0e951ac 100644 --- a/src/core/atomicdex/services/mm2/mm2.service.hpp +++ b/src/core/atomicdex/services/mm2/mm2.service.hpp @@ -31,10 +31,10 @@ #include "atomicdex/api/mm2/mm2.constants.hpp" #include "atomicdex/api/mm2/mm2.error.code.hpp" #include "atomicdex/api/mm2/mm2.hpp" -#include "atomicdex/api/mm2/rpc.balance.hpp" -#include "atomicdex/api/mm2/rpc.max.taker.vol.hpp" -#include "atomicdex/api/mm2/rpc.min.volume.hpp" -#include "atomicdex/api/mm2/rpc.orderbook.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.min_trading_vol.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.orderbook.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.max_taker_vol.hpp" +#include "atomicdex/api/mm2/rpc_v1/rpc.my_balance.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_bch_with_tokens_rpc.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_slp_rpc.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.enable_tendermint_with_assets.hpp" diff --git a/src/tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp b/src/tests/api/mm2/mm2.rpc2.trade_preimage.tests.cpp similarity index 98% rename from src/tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp rename to src/tests/api/mm2/mm2.rpc2.trade_preimage.tests.cpp index 5b088505ae..ee920f3e43 100644 --- a/src/tests/api/mm2/mm2.rpc.trade.preimage.tests.cpp +++ b/src/tests/api/mm2/mm2.rpc2.trade_preimage.tests.cpp @@ -16,7 +16,7 @@ //! Project Headers #include "atomicdex/api/mm2/mm2.hpp" -#include "atomicdex/api/mm2/rpc.trade.preimage.hpp" +#include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" //! Constants namespace @@ -321,7 +321,7 @@ TEST_SUITE("atomic_dex::mm2::preimage_answer deserialization test suites") //! Project Headers #include "atomicdex/api/mm2/mm2.hpp" - #include "atomicdex/api/mm2/rpc.trade.preimage.hpp" ///< replace this one by your current rpc file + #include "atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.hpp" ///< replace this one by your current rpc file */ SCENARIO("atomic_dex::mm2::preimage scenario") { @@ -335,7 +335,7 @@ SCENARIO("atomic_dex::mm2::preimage scenario") CHECK(batch.is_array()); //! Prepare request template - nlohmann::json request_json = atomic_dex::mm2::template_request("trade_preimage"); + nlohmann::json request_json = atomic_dex::mm2::template_request("trade_preimage", true); //! Retrieve mm2 service auto& mm2 = g_context->system_manager().get_system(); From b087f83a5fe45eba7248b1c9efb1f464207d5cec Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 15 Dec 2023 18:34:39 +0800 Subject: [PATCH 3/4] add v2 erc methods boilerplate --- .../api/mm2/rpc_v2/rpc2.enable_erc20.cpp | 26 ++++++ .../api/mm2/rpc_v2/rpc2.enable_erc20.hpp | 58 ++++++++++++ .../rpc_v2/rpc2.enable_eth_with_tokens.cpp | 61 ++++++++++++ .../rpc_v2/rpc2.enable_eth_with_tokens.hpp | 93 +++++++++++++++++++ 4 files changed, 238 insertions(+) create mode 100644 src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.cpp create mode 100644 src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.hpp create mode 100644 src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.cpp create mode 100644 src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.hpp diff --git a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.cpp new file mode 100644 index 0000000000..4c4bf707c5 --- /dev/null +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.cpp @@ -0,0 +1,26 @@ +#include + +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.hpp" + +namespace atomic_dex::mm2 +{ + void to_json(nlohmann::json& j, const enable_erc20_rpc_request& request) + { + j["ticker"] = request.ticker; + if (request.activation_params.required_confirmations) + { + j["activation_params"]["required_confirmations"] = *request.activation_params.required_confirmations; + } + else + { + j["activation_params"] = nlohmann::json::object(); + } + } + + void from_json(const nlohmann::json& j, enable_erc20_rpc_result& in) + { + j.at("platform_coin").get_to(in.platform_coin); + j.at("required_confirmations").get_to(in.required_confirmations); + j.at("balances").get_to>(in.balances); + } +} \ No newline at end of file diff --git a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.hpp new file mode 100644 index 0000000000..1d59962b05 --- /dev/null +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_erc20.hpp @@ -0,0 +1,58 @@ +/****************************************************************************** + * Copyright © 2013-2023 The Komodo Platform Developers. * + * * + * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * + * the top-level directory of this distribution for the individual copyright * + * holder information and the developer policies on copyright and licensing. * + * * + * Unless otherwise agreed in a custom licensing agreement, no part of the * + * Komodo Platform software, including this file may be copied, modified, * + * propagated or distributed except according to the terms contained in the * + * LICENSE file * + * * + * Removal or modification of this copyright notice is prohibited. * + * * + ******************************************************************************/ + +#pragma once + +#include + +#include //> nlohmann::json +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" + +namespace atomic_dex::mm2 +{ + struct enable_erc20_rpc + { + static constexpr auto endpoint = "enable_erc20"; + static constexpr bool is_v2 = true; + + struct expected_request_type + { + std::string ticker; + struct { std::optional required_confirmations; } activation_params; + }; + + struct expected_result_type + { + std::string platform_coin; + int required_confirmations; + std::unordered_map balances; + }; + + using expected_error_type = rpc_basic_error_type; + + expected_request_type request; + std::optional result; + std::optional error; + }; + + using enable_erc20_rpc_request = enable_erc20_rpc::expected_request_type; + using enable_erc20_rpc_result = enable_erc20_rpc::expected_result_type; + using enable_erc20_rpc_error = enable_erc20_rpc::expected_error_type; + + void to_json(nlohmann::json& j, const enable_erc20_rpc_request& request); + void from_json(const nlohmann::json& j, enable_erc20_rpc_result& in); +} \ No newline at end of file diff --git a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.cpp new file mode 100644 index 0000000000..6d1ab8916f --- /dev/null +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.cpp @@ -0,0 +1,61 @@ +#include + +#include "atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.hpp" + +namespace atomic_dex::mm2 +{ + void to_json(nlohmann::json& j, const enable_eth_with_tokens_request_rpc& in) + { + j["ticker"] = in.ticker; + j["nodes"] = in.nodes; + j["tx_history"] = in.tx_history; + j["erc20_tokens_requests"] = in.erc20_tokens_requests; + if (in.required_confirmations.has_value()) + j["required_confirmations"] = in.required_confirmations.value(); + if (in.requires_notarization.has_value()) + j["requires_notarization"] = in.requires_notarization.value(); + + // Use this in mm2.service.cpp when constructing the request + // + // coin_config coin_info = get_coin_info(in.ticker); + // coin_config.fallback_swap_contract_address + // coin_config.swap_contract_address + // coin_config.gas_station_url + // coin_config.gas_station_decimals + + // SPDLOG_DEBUG("enable_erc20_with_tokens: {}", j.dump(4)); + } + + void to_json(nlohmann::json& j, const enable_eth_with_tokens_request_rpc::erc20_token_request_t& in) + { + j["ticker"] = in.ticker; + if (in.required_confirmations) + j["required_confirmations"] = in.required_confirmations.value(); + } + + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc& out) + { + out.current_block = json["current_block"]; + out.eth_addresses_infos = json["eth_addresses_infos"].get(); + out.erc20_addresses_infos = json["erc20_addresses_infos"].get(); + } + + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::derivation_method_t& out) + { + out.type = json["type"]; + } + + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::eth_address_infos_t& out) + { + out.derivation_method = json["derivation_method"]; + out.pubkey = json["pubkey"]; + out.balances = json["balances"]; + } + + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::erc20_address_infos_t& out) + { + out.derivation_method = json["derivation_method"]; + out.pubkey = json["pubkey"]; + out.balances = json["balances"].get(); + } +} \ No newline at end of file diff --git a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.hpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.hpp new file mode 100644 index 0000000000..5561b2fa40 --- /dev/null +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.enable_eth_with_tokens.hpp @@ -0,0 +1,93 @@ +/****************************************************************************** + * Copyright © 2013-2021 The Komodo Platform Developers. * + * * + * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * + * the top-level directory of this distribution for the individual copyright * + * holder information and the developer policies on copyright and licensing. * + * * + * Unless otherwise agreed in a custom licensing agreement, no part of the * + * Komodo Platform software, including this file may be copied, modified, * + * propagated or distributed except according to the terms contained in the * + * LICENSE file * + * * + * Removal or modification of this copyright notice is prohibited. * + * * + ******************************************************************************/ + +#pragma once + +#include + +#include "atomicdex/api/mm2/rpc.hpp" +#include "atomicdex/api/mm2/balance_info.hpp" +#include "atomicdex/config/enable.cfg.hpp" +#include "atomicdex/constants/qt.coins.enums.hpp" + +namespace atomic_dex::mm2 +{ + struct enable_eth_with_tokens_rpc + { + static constexpr auto endpoint = "enable_eth_with_tokens"; + static constexpr bool is_v2 = true; + + struct expected_request_type + { + struct erc20_token_request_t + { + std::string ticker; + std::optional required_confirmations; + }; + + std::string ticker; + CoinType coin_type; + std::optional gas_station_url; + std::string swap_contract_address; + std::string fallback_swap_contract; + bool tx_history{true}; + std::optional is_testnet{false}; + std::optional gas_station_decimals; + std::optional required_confirmations; + std::optional requires_notarization; + std::vector nodes; + std::vector erc20_tokens_requests; + }; + + struct expected_result_type + { + struct derivation_method_t { std::string type; }; + struct eth_address_infos_t + { + derivation_method_t derivation_method; + std::string pubkey; + balance_info balances; + }; + struct erc20_address_infos_t + { + derivation_method_t derivation_method; + std::string pubkey; + std::unordered_map balances; + }; + + std::size_t current_block; + std::unordered_map eth_addresses_infos; + std::unordered_map erc20_addresses_infos; + }; + + using expected_error_type = rpc_basic_error_type; + + expected_request_type request; + std::optional result; + std::optional error; + }; + + using enable_eth_with_tokens_request_rpc = enable_eth_with_tokens_rpc::expected_request_type; + using enable_eth_with_tokens_result_rpc = enable_eth_with_tokens_rpc::expected_result_type; + using enable_eth_with_tokens_error_rpc = enable_eth_with_tokens_rpc::expected_error_type; + + void to_json(nlohmann::json& j, const enable_eth_with_tokens_request_rpc& in); + void to_json(nlohmann::json& j, const enable_eth_with_tokens_request_rpc::erc20_token_request_t& in); + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc& out); + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::derivation_method_t& out); + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::eth_address_infos_t& out); + void from_json(const nlohmann::json& json, enable_eth_with_tokens_result_rpc::erc20_address_infos_t& out); +} \ No newline at end of file From 0d47f9dd4666fd98b620c6e083d7f15bdfada739 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 15 Dec 2023 19:06:11 +0800 Subject: [PATCH 4/4] fix v2 trade_preimage --- .../atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp index 273bf89cce..9f9c7ee44e 100644 --- a/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp +++ b/src/core/atomicdex/api/mm2/rpc_v2/rpc2.trade_preimage.cpp @@ -27,17 +27,17 @@ namespace atomic_dex::mm2 void to_json(nlohmann::json& j, const trade_preimage_request& request) { - j["base"] = request.base_coin; - j["rel"] = request.rel_coin; - j["swap_method"] = request.swap_method; - j["volume"] = request.volume; + j["params"]["base"] = request.base_coin; + j["params"]["rel"] = request.rel_coin; + j["params"]["swap_method"] = request.swap_method; + j["params"]["volume"] = request.volume; if (request.max.has_value()) { - j["max"] = request.max.value(); + j["params"]["max"] = request.max.value(); } if (request.price.has_value()) { - j["price"] = request.price.value(); + j["params"]["price"] = request.price.value(); } }