fix(hd-wallet): enable/withdraw using any account'/change/address_index #1933
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ use common::{get_utc_timestamp, now_sec, small_rng, DEX_FEE_ADDR_RAW_PUBKEY}; | |
| #[cfg(target_arch = "wasm32")] | ||
| use common::{now_ms, wait_until_ms}; | ||
| use crypto::privkey::key_pair_from_secret; | ||
| use crypto::{CryptoCtx, CryptoCtxError, GlobalHDAccountArc, KeyPairPolicy, StandardHDCoinAddress}; | ||
| use derive_more::Display; | ||
| use enum_from::EnumFromStringify; | ||
| use ethabi::{Contract, Function, Token}; | ||
|
|
@@ -110,7 +110,7 @@ use crate::nft::{find_wallet_nft_amount, WithdrawNftResult}; | |
| use v2_activation::{build_address_and_priv_key_policy, EthActivationV2Error}; | ||
|
|
||
| mod nonce; | ||
| use crate::{PrivKeyPolicy, TransactionResult, WithdrawFrom}; | ||
| use nonce::ParityNonce; | ||
|
|
||
| /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol | ||
|
|
@@ -171,6 +171,7 @@ lazy_static! { | |
| pub type Web3RpcFut<T> = Box<dyn Future<Item = T, Error = MmError<Web3RpcError>> + Send>; | ||
| pub type Web3RpcResult<T> = Result<T, MmError<Web3RpcError>>; | ||
| pub type GasStationResult = Result<GasStationData, MmError<GasStationReqErr>>; | ||
| type EthPrivKeyPolicy = PrivKeyPolicy<KeyPair>; | ||
| type GasDetails = (U256, U256); | ||
|
|
||
| #[derive(Debug, Display)] | ||
|
|
@@ -410,35 +411,6 @@ impl TryFrom<PrivKeyBuildPolicy> for EthPrivKeyBuildPolicy { | |
| } | ||
| } | ||
|
|
||
| /// pImpl idiom. | ||
| pub struct EthCoinImpl { | ||
|
rozhkovdmitrii marked this conversation as resolved.
|
||
| ticker: String, | ||
|
|
@@ -736,7 +708,28 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult { | |
| let to_addr = coin | ||
| .address_from_str(&req.to) | ||
| .map_to_mm(WithdrawError::InvalidAddress)?; | ||
| let (my_balance, my_address, key_pair) = match req.from { | ||
| Some(WithdrawFrom::HDWalletAddress(ref path_to_address)) => { | ||
| let raw_priv_key = coin | ||
| .priv_key_policy | ||
| .hd_wallet_derived_priv_key_or_err(path_to_address)?; | ||
| let key_pair = KeyPair::from_secret_slice(raw_priv_key.as_slice()) | ||
| .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?; | ||
| let address = key_pair.address(); | ||
| let balance = coin.address_balance(address).compat().await?; | ||
| (balance, address, key_pair) | ||
| }, | ||
| Some(WithdrawFrom::AddressId(_)) | Some(WithdrawFrom::DerivationPath { .. }) => { | ||
| return MmError::err(WithdrawError::UnexpectedFromAddress( | ||
| "Withdraw from 'AddressId' or 'DerivationPath' is not supported yet for EVM!".to_string(), | ||
| )) | ||
| }, | ||
| None => ( | ||
| coin.my_balance().compat().await?, | ||
| coin.my_address, | ||
| coin.priv_key_policy.activated_key_or_err()?.clone(), | ||
| ), | ||
| }; | ||
| let my_balance_dec = u256_to_big_decimal(my_balance, coin.decimals)?; | ||
|
|
||
| let (mut wei_amount, dec_amount) = if req.max { | ||
|
|
@@ -779,9 +772,10 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult { | |
| }; | ||
|
|
||
| let (tx_hash, tx_hex) = match coin.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(_) | EthPrivKeyPolicy::HDWallet { .. } => { | ||
| // Todo: nonce_lock is still global for all addresses but this needs to be per address | ||
|
rozhkovdmitrii marked this conversation as resolved.
|
||
| let _nonce_lock = coin.nonce_lock.lock().await; | ||
| let (nonce, _) = get_addr_nonce(my_address, coin.web3_instances.clone()) | ||
| .compat() | ||
| .timeout_secs(30.) | ||
| .await? | ||
|
|
@@ -801,6 +795,11 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult { | |
|
|
||
| (signed.hash, BytesJson::from(bytes.to_vec())) | ||
| }, | ||
| EthPrivKeyPolicy::Trezor => { | ||
| return MmError::err(WithdrawError::UnsupportedError( | ||
| "Trezor is not supported for EVM yet!".to_string(), | ||
| )) | ||
| }, | ||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(_) => { | ||
| if !req.broadcast { | ||
|
|
@@ -843,7 +842,7 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult { | |
|
|
||
| let amount_decimal = u256_to_big_decimal(wei_amount, coin.decimals)?; | ||
| let mut spent_by_me = amount_decimal.clone(); | ||
| let received_by_me = if to_addr == my_address { | ||
| amount_decimal.clone() | ||
| } else { | ||
| 0.into() | ||
|
|
@@ -852,10 +851,9 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult { | |
| if coin.coin_type == EthCoinType::Eth { | ||
| spent_by_me += &fee_details.total_fee; | ||
| } | ||
| Ok(TransactionDetails { | ||
| to: vec![checksum_address(&format!("{:#02x}", to_addr))], | ||
| from: vec![checksum_address(&format!("{:#02x}", my_address))], | ||
| total_amount: amount_decimal, | ||
| my_balance_change: &received_by_me - &spent_by_me, | ||
| spent_by_me, | ||
|
|
@@ -952,7 +950,7 @@ pub async fn withdraw_erc1155(ctx: MmArc, withdraw_type: WithdrawErc1155) -> Wit | |
| gas_price, | ||
| }; | ||
|
|
||
| let secret = eth_coin.priv_key_policy.activated_key_or_err()?.secret(); | ||
| let signed = tx.sign(secret, eth_coin.chain_id); | ||
| let signed_bytes = rlp::encode(&signed); | ||
| let fee_details = EthTxFeeDetails::new(gas, gas_price, fee_coin)?; | ||
|
|
@@ -1027,7 +1025,7 @@ pub async fn withdraw_erc721(ctx: MmArc, withdraw_type: WithdrawErc721) -> Withd | |
| gas_price, | ||
| }; | ||
|
|
||
| let secret = eth_coin.priv_key_policy.activated_key_or_err()?.secret(); | ||
| let signed = tx.sign(secret, eth_coin.chain_id); | ||
| let signed_bytes = rlp::encode(&signed); | ||
| let fee_details = EthTxFeeDetails::new(gas, gas_price, fee_coin)?; | ||
|
|
@@ -1307,9 +1305,12 @@ impl SwapOps for EthCoin { | |
| #[inline] | ||
| fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> keys::KeyPair { | ||
| match self.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(ref key_pair) | ||
| | EthPrivKeyPolicy::HDWallet { | ||
| activated_key: ref key_pair, | ||
| .. | ||
| } => key_pair_from_secret(key_pair.secret().as_bytes()).expect("valid key"), | ||
| EthPrivKeyPolicy::Trezor => todo!(), | ||
|
rozhkovdmitrii marked this conversation as resolved.
|
||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(_) => todo!(), | ||
| } | ||
|
|
@@ -1318,10 +1319,15 @@ impl SwapOps for EthCoin { | |
| #[inline] | ||
| fn derive_htlc_pubkey(&self, _swap_unique_data: &[u8]) -> Vec<u8> { | ||
| match self.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(ref key_pair) | ||
| | EthPrivKeyPolicy::HDWallet { | ||
| activated_key: ref key_pair, | ||
| .. | ||
| } => key_pair_from_secret(key_pair.secret().as_bytes()) | ||
| .expect("valid key") | ||
| .public_slice() | ||
| .to_vec(), | ||
| EthPrivKeyPolicy::Trezor => todo!(), | ||
|
rozhkovdmitrii marked this conversation as resolved.
|
||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(ref metamask_policy) => metamask_policy.public_key.as_bytes().to_vec(), | ||
| } | ||
|
|
@@ -1811,10 +1817,15 @@ impl MarketCoinOps for EthCoin { | |
|
|
||
| fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { | ||
| match self.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(ref key_pair) | ||
| | EthPrivKeyPolicy::HDWallet { | ||
| activated_key: ref key_pair, | ||
| .. | ||
| } => { | ||
| let uncompressed_without_prefix = hex::encode(key_pair.public()); | ||
| Ok(format!("04{}", uncompressed_without_prefix)) | ||
| }, | ||
| EthPrivKeyPolicy::Trezor => MmError::err(UnexpectedDerivationMethod::Trezor), | ||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(ref metamask_policy) => { | ||
| Ok(format!("{:02x}", metamask_policy.public_key_uncompressed)) | ||
|
|
@@ -1838,7 +1849,7 @@ impl MarketCoinOps for EthCoin { | |
|
|
||
| fn sign_message(&self, message: &str) -> SignatureResult<String> { | ||
| let message_hash = self.sign_message_hash(message).ok_or(SignatureError::PrefixNotFound)?; | ||
| let privkey = &self.priv_key_policy.activated_key_or_err()?.secret(); | ||
| let signature = sign(privkey, &H256::from(message_hash))?; | ||
| Ok(format!("0x{}", signature)) | ||
| } | ||
|
|
@@ -2109,7 +2120,12 @@ impl MarketCoinOps for EthCoin { | |
|
|
||
| fn display_priv_key(&self) -> Result<String, String> { | ||
| match self.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(ref key_pair) | ||
|
There was a problem hiding this comment. Just an idea for the future: it might be worth adding
Collaborator
Author
There was a problem hiding this comment. Thanks for the idea, a way to import/export private keys is planned for the future so this is the way to achieve the exporting part. Added it to a checklist #1838 (comment) It should be allowed to specify which level of the derivation path to export/display a private key for too. Exporting public key/s should be added too. |
||
| | EthPrivKeyPolicy::HDWallet { | ||
| activated_key: ref key_pair, | ||
| .. | ||
| } => Ok(format!("{:#02x}", key_pair.secret())), | ||
| EthPrivKeyPolicy::Trezor => ERR!("'display_priv_key' doesn't support Trezor yet!"), | ||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(_) => ERR!("'display_priv_key' doesn't support MetaMask"), | ||
| } | ||
|
|
@@ -2974,9 +2990,12 @@ impl EthCoin { | |
| let coin = self.clone(); | ||
| let fut = async move { | ||
| match coin.priv_key_policy { | ||
| EthPrivKeyPolicy::Iguana(ref key_pair) | ||
| | EthPrivKeyPolicy::HDWallet { | ||
| activated_key: ref key_pair, | ||
| .. | ||
| } => sign_and_send_transaction_with_keypair(ctx, &coin, key_pair, value, action, data, gas).await, | ||
| EthPrivKeyPolicy::Trezor => Err(TransactionErr::Plain(ERRL!("Trezor is not supported for EVM yet!"))), | ||
| #[cfg(target_arch = "wasm32")] | ||
| EthPrivKeyPolicy::Metamask(_) => { | ||
| sign_and_send_transaction_with_metamask(coin, value, action, data, gas).await | ||
|
|
@@ -3613,18 +3632,14 @@ impl EthCoin { | |
| } | ||
| } | ||
|
|
||
| fn address_balance(&self, address: Address) -> BalanceFut<U256> { | ||
| let coin = self.clone(); | ||
| let fut = async move { | ||
| match coin.coin_type { | ||
| EthCoinType::Eth => Ok(coin.web3.eth().balance(address, Some(BlockNumber::Latest)).await?), | ||
| EthCoinType::Erc20 { ref token_addr, .. } => { | ||
| let function = ERC20_CONTRACT.function("balanceOf")?; | ||
| let data = function.encode_input(&[Token::Address(address)])?; | ||
|
|
||
| let res = coin.call_request(*token_addr, None, Some(data.into())).await?; | ||
| let decoded = function.decode_output(&res.0)?; | ||
|
|
@@ -3641,6 +3656,8 @@ impl EthCoin { | |
| Box::new(fut.boxed().compat()) | ||
| } | ||
|
|
||
| fn my_balance(&self) -> BalanceFut<U256> { self.address_balance(self.my_address) } | ||
|
|
||
| pub async fn get_tokens_balance_list(&self) -> Result<HashMap<String, CoinBalance>, MmError<BalanceError>> { | ||
| let coin = || self; | ||
| let mut requests = Vec::new(); | ||
|
|
@@ -5140,7 +5157,12 @@ pub async fn eth_coin_from_conf_and_request( | |
| } | ||
| let contract_supports_watchers = req["contract_supports_watchers"].as_bool().unwrap_or_default(); | ||
|
|
||
| let path_to_address = try_s!(json::from_value::<Option<StandardHDCoinAddress>>( | ||
| req["path_to_address"].clone() | ||
| )) | ||
| .unwrap_or_default(); | ||
|
rozhkovdmitrii marked this conversation as resolved.
|
||
| let (my_address, key_pair) = | ||
| try_s!(build_address_and_priv_key_policy(conf, priv_key_policy, &path_to_address).await); | ||
|
|
||
| let mut web3_instances = vec![]; | ||
| let event_handlers = rpc_event_handlers_for_eth_transport(ctx, ticker.to_string()); | ||
|
|
@@ -5400,12 +5422,17 @@ impl From<CryptoCtxError> for GetEthAddressError { | |
|
|
||
| /// `get_eth_address` returns wallet address for coin with `ETH` protocol type. | ||
| /// Note: result address has mixed-case checksum form. | ||
| pub async fn get_eth_address( | ||
| ctx: &MmArc, | ||
| conf: &Json, | ||
| ticker: &str, | ||
| path_to_address: &StandardHDCoinAddress, | ||
| ) -> MmResult<MyWalletAddress, GetEthAddressError> { | ||
| let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(ctx)?; | ||
| // Convert `PrivKeyBuildPolicy` to `EthPrivKeyBuildPolicy` if it's possible. | ||
| let priv_key_policy = EthPrivKeyBuildPolicy::try_from(priv_key_policy)?; | ||
|
|
||
| let (my_address, ..) = build_address_and_priv_key_policy(conf, priv_key_policy, path_to_address).await?; | ||
| let wallet_address = checksum_address(&format!("{:#02x}", my_address)); | ||
|
|
||
| Ok(MyWalletAddress { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.