Merge branch 'dev' into burn-dex-fee-for-non-kmd

* dev: feat(ETH): eip1559 gas fee estimator and rpcs (#2051) fix(p2pk-tests): fix p2pk tests post merge (#2119) fix(p2pk): show and spend P2PK balance (#2053) fix(swap): use tmp file for swap and order files (#2118)
KomodoPlatform · May 22, 2024 · 0f34d2e · 0f34d2e
2 parents 0e2869e + fa71adb
commit 0f34d2e
Show file tree

Hide file tree

Showing 94 changed files with 3,429 additions and 1,677 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mm2src/adex_cli/src/rpc_data.rs b/mm2src/adex_cli/src/rpc_data.rs
@@ -3,7 +3,7 @@
 //! *Note: it's expected that the following data types will be moved to mm2_rpc::data when mm2 is refactored to be able to handle them*
 //!
 
-use mm2_rpc::data::legacy::{ElectrumProtocol, GasStationPricePolicy, UtxoMergeParams};
+use mm2_rpc::data::legacy::{ElectrumProtocol, UtxoMergeParams};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -23,12 +23,6 @@ pub(crate) struct EnableRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     fallback_swap_contract: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    gas_station_url: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    gas_station_decimals: Option<u8>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    gas_station_policy: Option<GasStationPricePolicy>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     mm2: Option<u8>,
     #[serde(default)]
     tx_history: bool,

diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
@@ -50,9 +50,9 @@ derive_more = "0.99"
 ed25519-dalek = "1.0.1"
 enum_derives = { path = "../derives/enum_derives" }
 ethabi = { version = "17.0.0" }
-ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
+ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
 ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
-ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
+ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" }
 # Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
 #enum_dispatch = "0.1"
 futures01 = { version = "0.1", package = "futures" }
@@ -112,7 +112,7 @@ url = { version = "2.2.2", features = ["serde"] }
 uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
 # One of web3 dependencies is the old `tokio-uds 0.1.7` which fails cross-compiling to ARM.
 # We don't need the default web3 features at all since we added our own web3 transport using shared HYPER instance.
-web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.19.0", default-features = false }
+web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.20.0", default-features = false }
 zbase32 = "0.1.2"
 zcash_client_backend = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.1" }
 zcash_extras = { git = "https://github.com/KomodoPlatform/librustzcash.git", tag = "k-1.4.1" }

diff --git a/mm2src/coins/coin_errors.rs b/mm2src/coins/coin_errors.rs
@@ -71,9 +71,10 @@ impl From<Web3RpcError> for ValidatePaymentError {
         match e {
             Web3RpcError::Transport(tr) => ValidatePaymentError::Transport(tr),
             Web3RpcError::InvalidResponse(resp) => ValidatePaymentError::InvalidRpcResponse(resp),
-            Web3RpcError::Internal(internal) | Web3RpcError::Timeout(internal) => {
-                ValidatePaymentError::InternalError(internal)
-            },
+            Web3RpcError::Internal(internal)
+            | Web3RpcError::Timeout(internal)
+            | Web3RpcError::NumConversError(internal)
+            | Web3RpcError::InvalidGasApiConfig(internal) => ValidatePaymentError::InternalError(internal),
             Web3RpcError::NftProtocolNotSupported => ValidatePaymentError::NftProtocolNotSupported,
         }
     }