Merge pull request #2301 from KomodoPlatform/rm-bad-gas

remove matic gas urls, make param optional
KomodoPlatform · Jun 21, 2023 · d08ab51 · d08ab51
2 parents 87a453f + a55e94f
commit d08ab51
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/core/atomicdex/api/mm2/rpc.enable.cpp b/src/core/atomicdex/api/mm2/rpc.enable.cpp
@@ -36,8 +36,24 @@ namespace atomic_dex::mm2
         }
         case CoinType::Matic:
         {
-            j["gas_station_url"]        = cfg.is_testnet ? cfg.testnet_matic_gas_station_url : cfg.matic_gas_station_url;
-            j["gas_station_decimals"]   = cfg.matic_gas_station_decimals;
+            if (cfg.is_testnet)
+            {
+                if (cfg.testnet_matic_gas_station_url.has_value())
+                {
+                    j["gas_station_url"]        = cfg.testnet_matic_gas_station_url.value();
+                }
+            }
+            else
+            {
+                if (cfg.matic_gas_station_url.has_value())
+                {
+                    j["gas_station_url"]        = cfg.matic_gas_station_url.value();
+                }
+            }
+            if (cfg.matic_gas_station_decimals.has_value())
+            {
+                j["gas_station_decimals"]   = cfg.matic_gas_station_decimals.value();
+            }
         }
         default:
             j["urls"]                   = cfg.urls;

diff --git a/src/core/atomicdex/api/mm2/rpc.enable.hpp b/src/core/atomicdex/api/mm2/rpc.enable.hpp
@@ -34,11 +34,11 @@ namespace atomic_dex::mm2
         bool                        is_testnet{false};
         const std::string           swap_contract_address;
         std::optional<std::string>  fallback_swap_contract_address{std::nullopt};
-        const std::size_t           matic_gas_station_decimals{9};
+        std::optional<std::size_t>  matic_gas_station_decimals{9};
         std::string                 gas_station_url{"https://ethgasstation.info/json/ethgasAPI.json"};
-        std::string                 matic_gas_station_url{"https://gasstation-mainnet.matic.network/"};
-        std::string                 testnet_matic_gas_station_url{"https://gasstation-mumbai.matic.today/"};
-        std::string                 type; ///< QRC-20 ?
+        std::optional<std::string>  matic_gas_station_url{std::nullopt};
+        std::optional<std::string>  testnet_matic_gas_station_url{std::nullopt};
+        std::optional<std::string>  type; ///< QRC-20 ?
         bool                        with_tx_history{true};
     };
 

diff --git a/src/core/atomicdex/config/coins.cfg.hpp b/src/core/atomicdex/config/coins.cfg.hpp
@@ -33,7 +33,7 @@ namespace atomic_dex
     struct coin_config
     {
         static constexpr const char* erc_gas_stations   = "https://ethgasstation.info/json/ethgasAPI.json";
-        static constexpr const char* matic_gas_stations = "https://gasstation-mainnet.matic.network/";
+        std::optional<std::string>                        matic_gas_stations{std::nullopt};
         using electrum_servers                          = std::vector<electrum_server>;
         using nodes                                     = std::vector<node>;
         using url_list                                  = std::vector<std::string>;