From 0603bd9f5b4959edc87ffa2a312bbc22af01e224 Mon Sep 17 00:00:00 2001 From: oisupov Date: Wed, 11 Oct 2023 23:50:50 +0700 Subject: [PATCH] Review fix --- ...browser_context_keyed_service_factories.cc | 4 ++++ .../brave_wallet/browser/zcash/zcash_rpc.cc | 19 +++++++------------ .../brave_wallet/browser/zcash/zcash_rpc.h | 2 +- .../create-account-modal.tsx | 2 +- components/brave_wallet_ui/constants/types.ts | 1 + 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/browser/browser_context_keyed_service_factories.cc b/browser/browser_context_keyed_service_factories.cc index f468b3082af00..b422a12d6befc 100644 --- a/browser/browser_context_keyed_service_factories.cc +++ b/browser/browser_context_keyed_service_factories.cc @@ -13,6 +13,7 @@ #include "brave/browser/brave_rewards/rewards_service_factory.h" #include "brave/browser/brave_shields/ad_block_pref_service_factory.h" #include "brave/browser/brave_wallet/asset_ratio_service_factory.h" +#include "brave/browser/brave_wallet/bitcoin_wallet_service_factory.h" #include "brave/browser/brave_wallet/brave_wallet_ipfs_service_factory.h" #include "brave/browser/brave_wallet/brave_wallet_service_factory.h" #include "brave/browser/brave_wallet/json_rpc_service_factory.h" @@ -152,6 +153,9 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() { brave_wallet::TxServiceFactory::GetInstance(); brave_wallet::BraveWalletServiceFactory::GetInstance(); + if (brave_wallet::IsBitcoinEnabled()) { + brave_wallet::BitcoinWalletServiceFactory::GetInstance(); + } if (brave_wallet::IsZCashEnabled()) { brave_wallet::ZCashWalletServiceFactory::GetInstance(); } diff --git a/components/brave_wallet/browser/zcash/zcash_rpc.cc b/components/brave_wallet/browser/zcash/zcash_rpc.cc index 2ad265f4d77f9..6e4bec069ca4d 100644 --- a/components/brave_wallet/browser/zcash/zcash_rpc.cc +++ b/components/brave_wallet/browser/zcash/zcash_rpc.cc @@ -115,24 +115,19 @@ absl::optional ResolveSerializedMessage( if (grpc_response_body.size() < 5) { return absl::nullopt; } - if (grpc_response_body.c_str()[0] != 0) { + if (grpc_response_body[0] != 0) { // Compression is not supported yet return absl::nullopt; } uint32_t size = 0; - - uint8_t as_bytes[4]; - const char* size_start = &(grpc_response_body.c_str()[1]); - for (int i = 0; i < 4; i++) { - as_bytes[i] = static_cast(size_start[i]); - } - base::ReadBigEndian(as_bytes, &size); + base::ReadBigEndian( + reinterpret_cast(&(grpc_response_body[1])), &size); if (grpc_response_body.size() != size + 5) { return absl::nullopt; } - return grpc_response_body.substr(5, grpc_response_body.size() - 5); + return grpc_response_body.substr(5); } } // namespace @@ -145,7 +140,7 @@ ZCashRpc::ZCashRpc( ZCashRpc::~ZCashRpc() = default; void ZCashRpc::GetUtxoList(const std::string& chain_id, - const std::vector& addresses, + const std::string& address, ZCashRpc::GetUtxoListCallback callback) { GURL request_url = MakeGetAddressUtxosURL( GetNetworkURL(prefs_, chain_id, mojom::CoinType::ZEC)); @@ -156,7 +151,7 @@ void ZCashRpc::GetUtxoList(const std::string& chain_id, } auto url_loader = - MakeGRPCLoader(request_url, MakeGetAddressUtxosURLParams(addresses)); + MakeGRPCLoader(request_url, MakeGetAddressUtxosURLParams({address})); UrlLoadersList::iterator it = url_loaders_list_.insert( url_loaders_list_.begin(), std::move(url_loader)); @@ -174,7 +169,6 @@ void ZCashRpc::OnGetUtxosResponse( const std::unique_ptr response_body) { auto current_loader = std::move(*it); url_loaders_list_.erase(it); - zcash::GetAddressUtxosResponse response; if (current_loader->NetError()) { std::move(callback).Run(base::unexpected("Network error")); return; @@ -191,6 +185,7 @@ void ZCashRpc::OnGetUtxosResponse( return; } + zcash::GetAddressUtxosResponse response; if (!response.ParseFromString(message.value())) { std::move(callback).Run(base::unexpected("Can't parse response")); return; diff --git a/components/brave_wallet/browser/zcash/zcash_rpc.h b/components/brave_wallet/browser/zcash/zcash_rpc.h index 4c2ceb6495b44..7478eedd39e09 100644 --- a/components/brave_wallet/browser/zcash/zcash_rpc.h +++ b/components/brave_wallet/browser/zcash/zcash_rpc.h @@ -35,7 +35,7 @@ class ZCashRpc { ~ZCashRpc(); void GetUtxoList(const std::string& chain_id, - const std::vector& addresses, + const std::string& address, GetUtxoListCallback callback); private: diff --git a/components/brave_wallet_ui/components/desktop/popup-modals/add-account-modal/create-account-modal.tsx b/components/brave_wallet_ui/components/desktop/popup-modals/add-account-modal/create-account-modal.tsx index b34134fea6cae..2386ce07bbc16 100644 --- a/components/brave_wallet_ui/components/desktop/popup-modals/add-account-modal/create-account-modal.tsx +++ b/components/brave_wallet_ui/components/desktop/popup-modals/add-account-modal/create-account-modal.tsx @@ -224,7 +224,7 @@ export const CreateAccountModal = () => { } {selectedAccountType?.coin === BraveWallet.CoinType.ZEC && - {ZCashNetworkTypes.map((network) => { return (
diff --git a/components/brave_wallet_ui/constants/types.ts b/components/brave_wallet_ui/constants/types.ts index 6661135aec256..01e5257d30ca6 100644 --- a/components/brave_wallet_ui/constants/types.ts +++ b/components/brave_wallet_ui/constants/types.ts @@ -795,6 +795,7 @@ export interface TransactionProviderErrorRegistry { export const SupportedCoinTypes = [ BraveWallet.CoinType.SOL, + BraveWallet.CoinType.ETH, BraveWallet.CoinType.FIL, BraveWallet.CoinType.BTC, BraveWallet.CoinType.ZEC