From d18b0cc77bcdf47505ccb32b68f28935c8002ca1 Mon Sep 17 00:00:00 2001 From: Anton Paymyshev Date: Tue, 26 May 2026 21:54:13 +0700 Subject: [PATCH] [Wallet] Remove wallet p3a mojo (#36658) --- .../BraveWalletServiceFactory.java | 15 ------ .../activities/BraveWalletBaseActivity.java | 19 ------- .../fragments/BaseWalletNextPageFragment.java | 11 ----- browser/brave_content_browser_client.cc | 22 --------- .../brave_wallet_service_factory_android.cc | 7 --- .../wallet_page/wallet_page_ui.cc | 2 - .../brave_wallet/wallet_page/wallet_page_ui.h | 1 - .../wallet_panel/wallet_panel_ui.cc | 3 -- .../wallet_panel/wallet_panel_ui.h | 2 - components/brave_wallet/browser/BUILD.gn | 4 -- .../bitcoin/bitcoin_tx_manager_unittest.cc | 1 - .../brave_wallet/browser/brave_wallet_p3a.cc | 34 ------------- .../brave_wallet/browser/brave_wallet_p3a.h | 49 ------------------- .../browser/brave_wallet_p3a_private.h | 23 --------- .../browser/brave_wallet_service.cc | 13 ----- .../browser/brave_wallet_service.h | 4 -- .../cardano/cardano_tx_manager_unittest.cc | 1 - components/brave_wallet/browser/pref_names.cc | 1 - components/brave_wallet/browser/tx_service.h | 1 - .../browser/zcash/zcash_tx_manager.h | 2 - .../brave_wallet/common/brave_wallet.mojom | 5 -- .../common/async/__mocks__/bridge.ts | 2 - .../common/slices/api.slice.ts | 3 -- .../common/slices/endpoints/p3a.endpoints.ts | 14 ------ .../common/wallet_api_proxy.ts | 1 - .../page/wallet_page_api_proxy.ts | 1 - .../panel/wallet_panel_api_proxy.ts | 1 - components/p3a/metric_names.h | 6 --- .../BrowserViewController/BVC+Menu.swift | 8 +-- .../BrowserViewController/BVC+Wallet.swift | 7 --- .../BrowserViewController.swift | 3 -- .../Crypto/Stores/CryptoStore.swift | 4 -- .../Crypto/Stores/KeyringStore.swift | 3 -- .../BraveWallet/Crypto/Stores/NFTStore.swift | 3 -- .../Crypto/Stores/WalletStore.swift | 7 +-- .../PreviewContent/MockStores.swift | 5 +- .../PreviewContent/TestBraveWalletP3A.swift | 14 ------ .../BraveWalletTests/KeyringStoreTests.swift | 6 +-- .../ManageSiteConnectionsStoreTests.swift | 12 ++--- .../BraveWalletTests/NFTStoreTests.swift | 9 ---- .../api/brave_wallet/brave_wallet_api.h | 3 -- .../api/brave_wallet/brave_wallet_api.mm | 14 ------ .../ui/webui/brave_wallet/wallet_page_ui.h | 2 - .../ui/webui/brave_wallet/wallet_page_ui.mm | 2 - 44 files changed, 10 insertions(+), 340 deletions(-) delete mode 100644 components/brave_wallet/browser/brave_wallet_p3a.cc delete mode 100644 components/brave_wallet/browser/brave_wallet_p3a.h delete mode 100644 components/brave_wallet/browser/brave_wallet_p3a_private.h delete mode 100644 components/brave_wallet_ui/common/slices/endpoints/p3a.endpoints.ts delete mode 100644 ios/brave-ios/Sources/BraveWallet/PreviewContent/TestBraveWalletP3A.swift diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java index bc9489674e5..76e30a9ad59 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/BraveWalletServiceFactory.java @@ -9,7 +9,6 @@ import org.jni_zero.JNINamespace; import org.jni_zero.NativeMethods; import org.chromium.brave_wallet.mojom.AssetRatioService; -import org.chromium.brave_wallet.mojom.BraveWalletP3a; import org.chromium.brave_wallet.mojom.BraveWalletService; import org.chromium.brave_wallet.mojom.EthTxManagerProxy; import org.chromium.brave_wallet.mojom.JsonRpcService; @@ -52,18 +51,6 @@ public class BraveWalletServiceFactory { return braveWalletService; } - public BraveWalletP3a getBraveWalletP3A(ConnectionErrorHandler connectionErrorHandler) { - Profile profile = Utils.getProfile(false); // always use regular profile - long nativeHandle = - BraveWalletServiceFactoryJni.get().getInterfaceToBraveWalletP3A(profile); - MessagePipeHandle handle = wrapNativeHandle(nativeHandle); - BraveWalletP3a braveWalletP3A = BraveWalletP3a.MANAGER.attachProxy(handle, 0); - Handler handler = ((Interface.Proxy) braveWalletP3A).getProxyHandler(); - handler.setErrorHandler(connectionErrorHandler); - - return braveWalletP3A; - } - public JsonRpcService getJsonRpcService(ConnectionErrorHandler connectionErrorHandler) { Profile profile = Utils.getProfile(false); // always use regular profile long nativeHandle = @@ -145,8 +132,6 @@ public class BraveWalletServiceFactory { interface Natives { long getInterfaceToBraveWalletService(Profile profile); - long getInterfaceToBraveWalletP3A(Profile profile); - long getInterfaceToJsonRpcService(Profile profile); long getInterfaceToKeyringService(Profile profile); diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletBaseActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletBaseActivity.java index 1359eb91c2f..aed9b7b03e7 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletBaseActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletBaseActivity.java @@ -10,7 +10,6 @@ import android.view.MenuItem; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.brave_wallet.mojom.AssetRatioService; import org.chromium.brave_wallet.mojom.BlockchainRegistry; -import org.chromium.brave_wallet.mojom.BraveWalletP3a; import org.chromium.brave_wallet.mojom.BraveWalletService; import org.chromium.brave_wallet.mojom.EthTxManagerProxy; import org.chromium.brave_wallet.mojom.JsonRpcService; @@ -41,7 +40,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit protected EthTxManagerProxy mEthTxManagerProxy; protected SolanaTxManagerProxy mSolanaTxManagerProxy; protected AssetRatioService mAssetRatioService; - protected BraveWalletP3a mBraveWalletP3A; protected BraveWalletService mBraveWalletService; private KeyringServiceObserverImpl mKeyringServiceObserver; private TxServiceObserverImpl mTxServiceObserver; @@ -72,7 +70,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit if (mTxService != null) mTxService.close(); if (mEthTxManagerProxy != null) mEthTxManagerProxy.close(); if (mSolanaTxManagerProxy != null) mSolanaTxManagerProxy.close(); - if (mBraveWalletP3A != null) mBraveWalletP3A.close(); if (mBraveWalletService != null) mBraveWalletService.close(); mKeyringService = null; @@ -82,7 +79,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit mEthTxManagerProxy = null; mSolanaTxManagerProxy = null; mAssetRatioService = null; - mBraveWalletP3A = null; mBraveWalletService = null; initKeyringService(); initBlockchainRegistry(); @@ -91,7 +87,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit initEthTxManagerProxy(); initSolanaTxManagerProxy(); initAssetRatioService(); - initBraveWalletP3A(); initBraveWalletService(); } @@ -156,14 +151,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit mAssetRatioService = BraveWalletServiceFactory.getInstance().getAssetRatioService(this); } - protected void initBraveWalletP3A() { - if (mBraveWalletP3A != null) { - return; - } - - mBraveWalletP3A = BraveWalletServiceFactory.getInstance().getBraveWalletP3A(this); - } - protected void initBraveWalletService() { if (mBraveWalletService != null) { return; @@ -204,10 +191,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit return mBraveWalletService; } - public BraveWalletP3a getBraveWalletP3A() { - return mBraveWalletP3A; - } - @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -228,7 +211,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit initEthTxManagerProxy(); initSolanaTxManagerProxy(); initAssetRatioService(); - initBraveWalletP3A(); initBraveWalletService(); } @@ -248,7 +230,6 @@ public abstract class BraveWalletBaseActivity extends AsyncInitializationActivit if (mTxService != null) mTxService.close(); if (mEthTxManagerProxy != null) mEthTxManagerProxy.close(); if (mSolanaTxManagerProxy != null) mSolanaTxManagerProxy.close(); - if (mBraveWalletP3A != null) mBraveWalletP3A.close(); if (mBraveWalletService != null) mBraveWalletService.close(); super.onDestroy(); } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java index 3e4ded76410..3cfa0635f13 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/BaseWalletNextPageFragment.java @@ -23,7 +23,6 @@ import androidx.annotation.RequiresApi; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import org.chromium.brave_wallet.mojom.BraveWalletP3a; import org.chromium.brave_wallet.mojom.JsonRpcService; import org.chromium.brave_wallet.mojom.KeyringService; import org.chromium.chrome.R; @@ -136,16 +135,6 @@ public abstract class BaseWalletNextPageFragment extends Fragment { return null; } - @Nullable - protected BraveWalletP3a getBraveWalletP3A() { - Activity activity = getActivity(); - if (activity instanceof BraveWalletActivity) { - return ((BraveWalletActivity) activity).getBraveWalletP3A(); - } - - return null; - } - protected void setAnimatedBackground(@NonNull final View rootView) { mAnimationDrawable = (AnimationDrawable) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index ad4e71b0977..368a8d67951 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -183,7 +183,6 @@ #include "brave/browser/brave_wallet/brave_wallet_provider_delegate_impl.h" #include "brave/browser/brave_wallet/brave_wallet_service_factory.h" #include "brave/browser/brave_wallet/brave_wallet_tab_helper.h" -#include "brave/components/brave_wallet/browser/brave_wallet_p3a_private.h" #include "brave/components/brave_wallet/browser/brave_wallet_service.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" @@ -370,25 +369,6 @@ void BindCosmeticFiltersResources( &BindCosmeticFiltersResourcesOnTaskRunner, std::move(receiver))); } -#if BUILDFLAG(ENABLE_BRAVE_WALLET) -void MaybeBindWalletP3A( - content::RenderFrameHost* const frame_host, - mojo::PendingReceiver receiver) { - auto* context = frame_host->GetBrowserContext(); - if (brave_wallet::IsAllowedForContext(frame_host->GetBrowserContext())) { - brave_wallet::BraveWalletService* wallet_service = - brave_wallet::BraveWalletServiceFactory::GetServiceForContext(context); - DCHECK(wallet_service); - wallet_service->GetBraveWalletP3A()->Bind(std::move(receiver)); - } else { - // Dummy API to avoid reporting P3A for OTR contexts - mojo::MakeSelfOwnedReceiver( - std::make_unique(), - std::move(receiver)); - } -} -#endif - void BindBraveSearchFallbackHost( content::ChildProcessId process_id, mojo::PendingReceiver receiver) { @@ -952,8 +932,6 @@ void BraveContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( } #if BUILDFLAG(ENABLE_BRAVE_WALLET) - map->Add( - base::BindRepeating(&MaybeBindWalletP3A)); if (brave_wallet::IsAllowedForContext( render_frame_host->GetBrowserContext())) { map->Add(base::BindRepeating( diff --git a/browser/brave_wallet/android/brave_wallet_service_factory_android.cc b/browser/brave_wallet/android/brave_wallet_service_factory_android.cc index c67e6426d0e..11bdc3c31e4 100644 --- a/browser/brave_wallet/android/brave_wallet_service_factory_android.cc +++ b/browser/brave_wallet/android/brave_wallet_service_factory_android.cc @@ -39,13 +39,6 @@ static int64_t JNI_BraveWalletServiceFactory_GetInterfaceToBraveWalletService( env, profile_android); } -static int64_t JNI_BraveWalletServiceFactory_GetInterfaceToBraveWalletP3A( - JNIEnv* env, - const base::android::JavaRef& profile_android) { - return BindWalletService( - env, profile_android); -} - static int64_t JNI_BraveWalletServiceFactory_GetInterfaceToJsonRpcService( JNIEnv* env, const base::android::JavaRef& profile_android) { diff --git a/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.cc b/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.cc index 13b6a7c8c66..0c52681a99f 100644 --- a/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.cc +++ b/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.cc @@ -190,7 +190,6 @@ void WalletPageUI::CreatePageHandler( bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service_receiver, - mojo::PendingReceiver brave_wallet_p3a_receiver, mojo::PendingReceiver ipfs_service_receiver, mojo::PendingReceiver meld_integration_service) { @@ -216,7 +215,6 @@ void WalletPageUI::CreatePageHandler( wallet_service->Bind(std::move(solana_tx_manager_proxy_receiver)); wallet_service->Bind(std::move(filecoin_tx_manager_proxy_receiver)); wallet_service->Bind(std::move(bitcoin_tx_manager_proxy_receiver)); - wallet_service->Bind(std::move(brave_wallet_p3a_receiver)); wallet_service->Bind(std::move(asset_ratio_service_receiver)); wallet_service->Bind(std::move(swap_service_receiver)); wallet_service->Bind(std::move(meld_integration_service)); diff --git a/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.h b/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.h index ac9356bf36a..664a7c3410e 100644 --- a/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.h +++ b/browser/ui/webui/brave_wallet/wallet_page/wallet_page_ui.h @@ -66,7 +66,6 @@ class WalletPageUI : public ui::MojoWebUIController, mojo::PendingReceiver bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service, - mojo::PendingReceiver brave_wallet_p3a, mojo::PendingReceiver brave_wallet_ipfs_service_receiver, mojo::PendingReceiver diff --git a/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.cc b/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.cc index edc2f9ec8bd..43ed669b01d 100644 --- a/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.cc +++ b/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.cc @@ -187,8 +187,6 @@ void WalletPanelUI::CreatePanelHandler( bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service_receiver, - mojo::PendingReceiver - brave_wallet_p3a_receiver, mojo::PendingReceiver brave_wallet_ipfs_service_receiver, mojo::PendingReceiver @@ -216,7 +214,6 @@ void WalletPanelUI::CreatePanelHandler( wallet_service->Bind(std::move(solana_tx_manager_proxy_receiver)); wallet_service->Bind(std::move(filecoin_tx_manager_proxy_receiver)); wallet_service->Bind(std::move(bitcoin_tx_manager_proxy_receiver)); - wallet_service->Bind(std::move(brave_wallet_p3a_receiver)); wallet_service->Bind(std::move(asset_ratio_service_receiver)); wallet_service->Bind(std::move(swap_service_receiver)); wallet_service->Bind(std::move(simulation_service_receiver)); diff --git a/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.h b/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.h index 5f5b7c42335..8e9bca64e6f 100644 --- a/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.h +++ b/browser/ui/webui/brave_wallet/wallet_panel/wallet_panel_ui.h @@ -90,8 +90,6 @@ class WalletPanelUI : public TopChromeWebUIController, bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service, - mojo::PendingReceiver - brave_wallet_p3a, mojo::PendingReceiver brave_wallet_ipfs_service_receiver, mojo::PendingReceiver diff --git a/components/brave_wallet/browser/BUILD.gn b/components/brave_wallet/browser/BUILD.gn index 8131ebb5fd6..24cac1a38b1 100644 --- a/components/brave_wallet/browser/BUILD.gn +++ b/components/brave_wallet/browser/BUILD.gn @@ -64,9 +64,6 @@ static_library("browser") { "blockchain_registry.h", "brave_wallet_ipfs_service.cc", "brave_wallet_ipfs_service.h", - "brave_wallet_p3a.cc", - "brave_wallet_p3a.h", - "brave_wallet_p3a_private.h", "brave_wallet_provider_delegate.cc", "brave_wallet_provider_delegate.h", "brave_wallet_service.cc", @@ -341,7 +338,6 @@ static_library("browser") { "//brave/components/decentralized_dns/core", "//brave/components/ipfs", "//brave/components/json", - "//brave/components/p3a_utils", "//brave/components/resources:strings_grit", "//brave/components/services/brave_wallet/public/cpp", "//brave/components/services/brave_wallet/public/cpp/utils", diff --git a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager_unittest.cc b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager_unittest.cc index 69d7db700c8..f6ae8579e66 100644 --- a/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/bitcoin/bitcoin_tx_manager_unittest.cc @@ -14,7 +14,6 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_test_utils.h" -#include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/json_rpc_service.h" #include "brave/components/brave_wallet/browser/keyring_service.h" diff --git a/components/brave_wallet/browser/brave_wallet_p3a.cc b/components/brave_wallet/browser/brave_wallet_p3a.cc deleted file mode 100644 index 6bb4bd4bced..00000000000 --- a/components/brave_wallet/browser/brave_wallet_p3a.cc +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" - -#include - -#include "brave/components/brave_wallet/browser/brave_wallet_service.h" -#include "brave/components/brave_wallet/browser/keyring_service.h" -#include "brave/components/brave_wallet/browser/pref_names.h" -#include "brave/components/brave_wallet/browser/tx_service.h" -#include "brave/components/p3a_utils/feature_usage.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/scoped_user_pref_update.h" - -namespace brave_wallet { - -BraveWalletP3A::BraveWalletP3A(BraveWalletService* wallet_service, - KeyringService* keyring_service, - PrefService* profile_prefs, - PrefService* local_state) {} - -BraveWalletP3A::BraveWalletP3A() = default; - -BraveWalletP3A::~BraveWalletP3A() = default; - -void BraveWalletP3A::Bind( - mojo::PendingReceiver receiver) { - receivers_.Add(this, std::move(receiver)); -} - -} // namespace brave_wallet diff --git a/components/brave_wallet/browser/brave_wallet_p3a.h b/components/brave_wallet/browser/brave_wallet_p3a.h deleted file mode 100644 index 61b63bd9f5e..00000000000 --- a/components/brave_wallet/browser/brave_wallet_p3a.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_H_ -#define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_H_ - -#include "base/gtest_prod_util.h" -#include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "components/prefs/pref_change_registrar.h" -#include "mojo/public/cpp/bindings/receiver_set.h" - -class PrefService; - -namespace brave_wallet { - -class BraveWalletService; -class KeyringService; - -// Reports BraveWallet related P3A data -class BraveWalletP3A : public mojom::BraveWalletP3A { - public: - BraveWalletP3A(BraveWalletService* wallet_service, - KeyringService* keyring_service, - PrefService* profile_prefs, - PrefService* local_state); - - // For testing - BraveWalletP3A(); - - ~BraveWalletP3A() override; - BraveWalletP3A(const BraveWalletP3A&) = delete; - BraveWalletP3A& operator=(BraveWalletP3A&) = delete; - - void Bind(mojo::PendingReceiver receiver); - - // KeyringServiceObserverBase: - - private: - FRIEND_TEST_ALL_PREFIXES(BraveWalletP3AUnitTest, ReportTransactionSent); - friend class BraveWalletP3AUnitTest; - - mojo::ReceiverSet receivers_; -}; - -} // namespace brave_wallet - -#endif // BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_H_ diff --git a/components/brave_wallet/browser/brave_wallet_p3a_private.h b/components/brave_wallet/browser/brave_wallet_p3a_private.h deleted file mode 100644 index 24339dcfd00..00000000000 --- a/components/brave_wallet/browser/brave_wallet_p3a_private.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2022 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at https://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_PRIVATE_H_ -#define BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_PRIVATE_H_ - -#include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/buildflags/buildflags.h" - -static_assert(BUILDFLAG(ENABLE_BRAVE_WALLET)); - -namespace brave_wallet { - -class BraveWalletP3APrivate : public mojom::BraveWalletP3A { - public: - BraveWalletP3APrivate() = default; -}; - -} // namespace brave_wallet - -#endif // BRAVE_COMPONENTS_BRAVE_WALLET_BROWSER_BRAVE_WALLET_P3A_PRIVATE_H_ diff --git a/components/brave_wallet/browser/brave_wallet_service.cc b/components/brave_wallet/browser/brave_wallet_service.cc index b241c1e61f5..a85089cb74e 100644 --- a/components/brave_wallet/browser/brave_wallet_service.cc +++ b/components/brave_wallet/browser/brave_wallet_service.cc @@ -287,9 +287,6 @@ BraveWalletService::BraveWalletService( GetCardanoWalletService(), GetPolkadotWalletService(), *keyring_service(), profile_prefs, CreateTxStorage(*delegate_)); - brave_wallet_p3a_ = std::make_unique( - this, keyring_service(), profile_prefs, local_state), - simple_hash_client_ = std::make_unique(url_loader_factory); asset_discovery_manager_ = std::make_unique( url_loader_factory, *this, *json_rpc_service(), *keyring_service(), @@ -436,12 +433,6 @@ void BraveWalletService::Bind( tx_service()->Bind(std::move(receiver)); } -template <> -void BraveWalletService::Bind( - mojo::PendingReceiver receiver) { - GetBraveWalletP3A()->Bind(std::move(receiver)); -} - template <> void BraveWalletService::Bind( mojo::PendingReceiver receiver) { @@ -1147,10 +1138,6 @@ void BraveWalletService::MigrateDeadNetwork( prefs->SetBoolean(pref_key, true); } -BraveWalletP3A* BraveWalletService::GetBraveWalletP3A() { - return brave_wallet_p3a_.get(); -} - BitcoinWalletService* BraveWalletService::GetBitcoinWalletService() { return bitcoin_wallet_service_.get(); } diff --git a/components/brave_wallet/browser/brave_wallet_service.h b/components/brave_wallet/browser/brave_wallet_service.h index dd4cdf699e2..73e4c24f386 100644 --- a/components/brave_wallet/browser/brave_wallet_service.h +++ b/components/brave_wallet/browser/brave_wallet_service.h @@ -20,7 +20,6 @@ #include "base/types/expected.h" #include "brave/components/brave_wallet/browser/asset_discovery_manager.h" #include "brave/components/brave_wallet/browser/bitcoin/bitcoin_wallet_service.h" -#include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" #include "brave/components/brave_wallet/browser/brave_wallet_service_delegate.h" #include "brave/components/brave_wallet/browser/cardano/cardano_wallet_service.h" #include "brave/components/brave_wallet/browser/keyring_service_observer_base.h" @@ -340,8 +339,6 @@ class BraveWalletService : public KeyedService, void RemovePrefListenersForTests(); - BraveWalletP3A* GetBraveWalletP3A(); - void SetSignSolTransactionsRequestAddedCallbackForTesting( base::OnceClosure callback) { sign_sol_txs_request_added_cb_for_testing_ = std::move(callback); @@ -496,7 +493,6 @@ class BraveWalletService : public KeyedService, std::unique_ptr zcash_wallet_service_; std::unique_ptr cardano_wallet_service_; std::unique_ptr tx_service_; - std::unique_ptr brave_wallet_p3a_; std::unique_ptr simple_hash_client_; std::unique_ptr asset_discovery_manager_; std::unique_ptr eth_allowance_manager_; diff --git a/components/brave_wallet/browser/cardano/cardano_tx_manager_unittest.cc b/components/brave_wallet/browser/cardano/cardano_tx_manager_unittest.cc index 9c2238a42f0..3a3acfa10cd 100644 --- a/components/brave_wallet/browser/cardano/cardano_tx_manager_unittest.cc +++ b/components/brave_wallet/browser/cardano/cardano_tx_manager_unittest.cc @@ -15,7 +15,6 @@ #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" -#include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/cardano/cardano_test_utils.h" #include "brave/components/brave_wallet/browser/cardano/cardano_tx_state_manager.h" diff --git a/components/brave_wallet/browser/pref_names.cc b/components/brave_wallet/browser/pref_names.cc index b44cb2d9370..bfa25990bd7 100644 --- a/components/brave_wallet/browser/pref_names.cc +++ b/components/brave_wallet/browser/pref_names.cc @@ -16,7 +16,6 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" #include "brave/components/brave_wallet/browser/keyring_service_migrations.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/p3a_utils/feature_usage.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" diff --git a/components/brave_wallet/browser/tx_service.h b/components/brave_wallet/browser/tx_service.h index e09ed24507c..ee03fb5303f 100644 --- a/components/brave_wallet/browser/tx_service.h +++ b/components/brave_wallet/browser/tx_service.h @@ -283,7 +283,6 @@ class TxService : public mojom::TxService, friend class BitcoinTxManagerUnitTest; friend class CardanoTxManagerUnitTest; friend class PolkadotTxManagerUnitTest; - friend class BraveWalletP3AUnitTest; void MigrateTransactionsFromPrefsToDB(PrefService* prefs); diff --git a/components/brave_wallet/browser/zcash/zcash_tx_manager.h b/components/brave_wallet/browser/zcash/zcash_tx_manager.h index 0aa32a7fd2f..88e6c8a1944 100644 --- a/components/brave_wallet/browser/zcash/zcash_tx_manager.h +++ b/components/brave_wallet/browser/zcash/zcash_tx_manager.h @@ -42,8 +42,6 @@ class ZCashTxManager : public TxManager, public ZCashBlockTracker::Observer { AddUnapprovedZCashTransactionCallback callback); private: - friend class BraveWalletP3AUnitTest; - ZCashTxStateManager& GetZCashTxStateManager(); ZCashBlockTracker& GetZCashBlockTracker(); diff --git a/components/brave_wallet/common/brave_wallet.mojom b/components/brave_wallet/common/brave_wallet.mojom index 98ee4c37769..10abe431d4f 100644 --- a/components/brave_wallet/common/brave_wallet.mojom +++ b/components/brave_wallet/common/brave_wallet.mojom @@ -393,7 +393,6 @@ interface PanelHandlerFactory { pending_receiver fil_tx_manager_proxy, pending_receiver btc_tx_manager_proxy, pending_receiver brave_wallet_service, - pending_receiver brave_wallet_p3a, pending_receiver brave_wallet_ipfs_service_receiver, pending_receiver meld_integration_service); }; @@ -418,7 +417,6 @@ interface PageHandlerFactory { pending_receiver fil_tx_manager_proxy, pending_receiver btc_tx_manager_proxy, pending_receiver brave_wallet_service, - pending_receiver brave_wallet_p3a, pending_receiver brave_wallet_ipfs_service, pending_receiver meld_integration_service); }; @@ -3165,9 +3163,6 @@ interface BraveWalletService { WriteToClipboard(string text, bool is_sensitive); }; -// For reporting wallet related P3A metrics. -interface BraveWalletP3A {}; - enum DefaultWallet { AskDeprecated = 0, None = 1, diff --git a/components/brave_wallet_ui/common/async/__mocks__/bridge.ts b/components/brave_wallet_ui/common/async/__mocks__/bridge.ts index ca35220699f..50efa31312f 100644 --- a/components/brave_wallet_ui/common/async/__mocks__/bridge.ts +++ b/components/brave_wallet_ui/common/async/__mocks__/bridge.ts @@ -756,8 +756,6 @@ export class MockedWalletApiProxy { }, } - braveWalletP3A: InstanceType = {} - assetRatioService: Partial< InstanceType > = { diff --git a/components/brave_wallet_ui/common/slices/api.slice.ts b/components/brave_wallet_ui/common/slices/api.slice.ts index 2616d45b0f9..3b283676edf 100644 --- a/components/brave_wallet_ui/common/slices/api.slice.ts +++ b/components/brave_wallet_ui/common/slices/api.slice.ts @@ -21,7 +21,6 @@ import { import { createWalletApiBase } from './api-base.slice' import { transactionSimulationEndpoints } from './endpoints/tx-simulation.endpoints' import { braveRewardsApiEndpoints } from './endpoints/rewards.endpoints' -import { p3aEndpoints } from './endpoints/p3a.endpoints' import { pricingEndpoints } from './endpoints/pricing.endpoints' import { nftsEndpoints } from './endpoints/nfts.endpoints' import { qrCodeEndpoints } from './endpoints/qr-code.endpoints' @@ -117,8 +116,6 @@ export function createWalletApi() { .injectEndpoints({ endpoints: braveRewardsApiEndpoints }) // tx simulation .injectEndpoints({ endpoints: transactionSimulationEndpoints }) - // p3a endpoints - .injectEndpoints({ endpoints: p3aEndpoints }) // price history endpoints .injectEndpoints({ endpoints: pricingEndpoints }) // nfts endpoints diff --git a/components/brave_wallet_ui/common/slices/endpoints/p3a.endpoints.ts b/components/brave_wallet_ui/common/slices/endpoints/p3a.endpoints.ts deleted file mode 100644 index a75ac8e49a1..00000000000 --- a/components/brave_wallet_ui/common/slices/endpoints/p3a.endpoints.ts +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2023 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this file, -// You can obtain one at https://mozilla.org/MPL/2.0/. - -// Types -import { WalletApiEndpointBuilderParams } from '../api-base.slice' - -export const p3aEndpoints = ({ - mutation, - query, -}: WalletApiEndpointBuilderParams) => { - return {} -} diff --git a/components/brave_wallet_ui/common/wallet_api_proxy.ts b/components/brave_wallet_ui/common/wallet_api_proxy.ts index 7206baaea04..f66a694d837 100644 --- a/components/brave_wallet_ui/common/wallet_api_proxy.ts +++ b/components/brave_wallet_ui/common/wallet_api_proxy.ts @@ -24,7 +24,6 @@ export class WalletApiProxy { filTxManagerProxy = new BraveWallet.FilTxManagerProxyRemote() btcTxManagerProxy = new BraveWallet.BtcTxManagerProxyRemote() braveWalletService = new BraveWallet.BraveWalletServiceRemote() - braveWalletP3A = new BraveWallet.BraveWalletP3ARemote() braveWalletIpfsService = new BraveWallet.IpfsServiceRemote() addJsonRpcServiceObserver( diff --git a/components/brave_wallet_ui/page/wallet_page_api_proxy.ts b/components/brave_wallet_ui/page/wallet_page_api_proxy.ts index 4583b4a5715..b6290419125 100644 --- a/components/brave_wallet_ui/page/wallet_page_api_proxy.ts +++ b/components/brave_wallet_ui/page/wallet_page_api_proxy.ts @@ -32,7 +32,6 @@ export class WalletPageApiProxy extends WalletApiProxy { this.filTxManagerProxy.$.bindNewPipeAndPassReceiver(), this.btcTxManagerProxy.$.bindNewPipeAndPassReceiver(), this.braveWalletService.$.bindNewPipeAndPassReceiver(), - this.braveWalletP3A.$.bindNewPipeAndPassReceiver(), this.braveWalletIpfsService.$.bindNewPipeAndPassReceiver(), this.meldIntegrationService.$.bindNewPipeAndPassReceiver(), ) diff --git a/components/brave_wallet_ui/panel/wallet_panel_api_proxy.ts b/components/brave_wallet_ui/panel/wallet_panel_api_proxy.ts index 8a3e010cf08..0ccaea3da4a 100644 --- a/components/brave_wallet_ui/panel/wallet_panel_api_proxy.ts +++ b/components/brave_wallet_ui/panel/wallet_panel_api_proxy.ts @@ -32,7 +32,6 @@ export class WalletPanelApiProxy extends WalletApiProxy { this.filTxManagerProxy.$.bindNewPipeAndPassReceiver(), this.btcTxManagerProxy.$.bindNewPipeAndPassReceiver(), this.braveWalletService.$.bindNewPipeAndPassReceiver(), - this.braveWalletP3A.$.bindNewPipeAndPassReceiver(), this.braveWalletIpfsService.$.bindNewPipeAndPassReceiver(), this.meldIntegrationService.$.bindNewPipeAndPassReceiver(), ) diff --git a/components/p3a/metric_names.h b/components/p3a/metric_names.h index 3e10d2e192a..0ae92386cb3 100644 --- a/components/p3a/metric_names.h +++ b/components/p3a/metric_names.h @@ -173,10 +173,6 @@ inline constexpr auto kCollectedTypicalHistograms = {"Brave.VerticalTabs.GroupTabs", MetricConfig{.ephemeral = true}}, {"Brave.VerticalTabs.OpenTabs", MetricConfig{.ephemeral = true}}, {"Brave.VerticalTabs.PinnedTabs", MetricConfig{.ephemeral = true}}, - {"Brave.Wallet.NFTCount", MetricConfig{.ephemeral = true}}, - {"Brave.Wallet.NewUserReturning", {}}, - {"Brave.Wallet.OnboardingConversion.3", MetricConfig{.ephemeral = true}}, - {"Brave.Wallet.UsageWeekly", MetricConfig{.ephemeral = true}}, {"Brave.WebTorrent.UsageWeekly", MetricConfig{.ephemeral = true}}, }); @@ -205,7 +201,6 @@ inline constexpr auto kCollectedSlowHistograms = {"Brave.Today.DirectFeedsTotal.3", MetricConfig{.ephemeral = true}}, {"Brave.Today.PublisherCount.2", MetricConfig{.ephemeral = true}}, {"Brave.Today.UsageMonthly", MetricConfig{.ephemeral = true}}, - {"Brave.Wallet.UsageMonthly", MetricConfig{.ephemeral = true}}, }); inline constexpr auto kCollectedExpressHistograms = @@ -335,7 +330,6 @@ inline constexpr auto kCollectedExpressHistograms = .record_activation_date = true }}, {"Brave.Uptime.BrowserOpenTime.2", MetricConfig{.ephemeral = true}}, - {"Brave.Wallet.UsageDaily", MetricConfig{.ephemeral = true}}, {"Brave.Welcome.InteractionStatus.2", MetricConfig{ .attributes = MetricAttributes{MetricAttribute::kAnswerIndex, MetricAttribute::kChannel, MetricAttribute::kPlatform, MetricAttribute::kDateOfInstall, MetricAttribute::kSubregion, MetricAttribute::kVersion}, }}, diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Menu.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Menu.swift index 8e96de3a4e5..6575652bdfa 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Menu.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Menu.swift @@ -24,20 +24,17 @@ extension BrowserViewController { let keyringService = BraveWallet.KeyringServiceFactory.get(privateMode: isPrivateMode) let walletService = BraveWallet.ServiceFactory.get(privateMode: isPrivateMode) let rpcService = BraveWallet.JsonRpcServiceFactory.get(privateMode: isPrivateMode) - let walletP3A = profileController.braveWalletAPI.walletP3A() var keyringStore: KeyringStore? = walletStore?.keyringStore if keyringStore == nil { if let keyringService = keyringService, let walletService = walletService, - let rpcService = rpcService, - let walletP3A + let rpcService = rpcService { keyringStore = KeyringStore( keyringService: keyringService, walletService: walletService, - rpcService: rpcService, - walletP3A: walletP3A + rpcService: rpcService ) } } @@ -46,7 +43,6 @@ extension BrowserViewController { if cryptoStore == nil { cryptoStore = CryptoStore.from( ipfsApi: profileController.ipfsAPI, - walletP3A: walletP3A, privateMode: isPrivateMode ) } diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Wallet.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Wallet.swift index 60d0f89c5dc..88edae7551b 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Wallet.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+Wallet.swift @@ -19,7 +19,6 @@ extension WalletStore { /// Creates a WalletStore based on whether or not the user is in Private Mode static func from( ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A?, privateMode: Bool ) -> WalletStore? { guard @@ -31,7 +30,6 @@ extension WalletStore { let txService = BraveWallet.TxServiceFactory.get(privateMode: privateMode), let ethTxManagerProxy = BraveWallet.EthTxManagerProxyFactory.get(privateMode: privateMode), let solTxManagerProxy = BraveWallet.SolanaTxManagerProxyFactory.get(privateMode: privateMode), - let walletP3A, let bitcoinWalletService = BraveWallet.BitcoinWalletServiceFactory.get( privateMode: privateMode ), @@ -59,7 +57,6 @@ extension WalletStore { ethTxManagerProxy: ethTxManagerProxy, solTxManagerProxy: solTxManagerProxy, ipfsApi: ipfsApi, - walletP3A: walletP3A, bitcoinWalletService: bitcoinWalletService, zcashWalletService: zcashWalletService, meldIntegrationService: meldIntegrationService, @@ -72,7 +69,6 @@ extension CryptoStore { /// Creates a CryptoStore based on whether or not the user is in Private Mode static func from( ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A?, privateMode: Bool ) -> CryptoStore? { guard @@ -84,7 +80,6 @@ extension CryptoStore { let txService = BraveWallet.TxServiceFactory.get(privateMode: privateMode), let ethTxManagerProxy = BraveWallet.EthTxManagerProxyFactory.get(privateMode: privateMode), let solTxManagerProxy = BraveWallet.SolanaTxManagerProxyFactory.get(privateMode: privateMode), - let walletP3A, let bitcoinWalletService = BraveWallet.BitcoinWalletServiceFactory.get( privateMode: privateMode ), @@ -112,7 +107,6 @@ extension CryptoStore { ethTxManagerProxy: ethTxManagerProxy, solTxManagerProxy: solTxManagerProxy, ipfsApi: ipfsApi, - walletP3A: walletP3A, bitcoinWalletService: bitcoinWalletService, zcashWalletService: zcashWalletService, meldIntegrationService: meldIntegrationService, @@ -132,7 +126,6 @@ extension BrowserViewController { guard let walletStore = WalletStore.from( ipfsApi: profileController.ipfsAPI, - walletP3A: profileController.braveWalletAPI.walletP3A(), privateMode: privateMode ) else { diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift index 56aae72acec..0e82e43421e 100644 --- a/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift +++ b/ios/brave-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController.swift @@ -2511,7 +2511,6 @@ extension BrowserViewController: TabMiscDelegate { let cryptoStore = self.walletStore?.cryptoStore ?? CryptoStore.from( ipfsApi: profileController.ipfsAPI, - walletP3A: profileController.braveWalletAPI.walletP3A(), privateMode: privateMode ) else { @@ -2946,7 +2945,6 @@ extension BrowserViewController: PreferencesObserver { let privateMode = privateBrowsingManager.isPrivateBrowsing if let cryptoStore = CryptoStore.from( ipfsApi: profileController.ipfsAPI, - walletP3A: profileController.braveWalletAPI.walletP3A(), privateMode: privateMode ) { cryptoStore.rejectAllPendingWebpageRequests() @@ -2961,7 +2959,6 @@ extension BrowserViewController: PreferencesObserver { let privateMode = privateBrowsingManager.isPrivateBrowsing if let cryptoStore = CryptoStore.from( ipfsApi: profileController.ipfsAPI, - walletP3A: profileController.braveWalletAPI.walletP3A(), privateMode: privateMode ) { cryptoStore.rejectAllPendingWebpageRequests() diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift index b4a7b9f6795..dce258ba302 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift @@ -123,7 +123,6 @@ public class CryptoStore: ObservableObject, WalletObserverStore { private let ethTxManagerProxy: BraveWalletEthTxManagerProxy private let solTxManagerProxy: BraveWalletSolanaTxManagerProxy private let ipfsApi: IpfsAPI - private let walletP3A: BraveWalletBraveWalletP3A private let bitcoinWalletService: BraveWalletBitcoinWalletService private let zcashWalletService: BraveWalletZCashWalletService private let meldIntegrationService: BraveWalletMeldIntegrationService @@ -148,7 +147,6 @@ public class CryptoStore: ObservableObject, WalletObserverStore { ethTxManagerProxy: BraveWalletEthTxManagerProxy, solTxManagerProxy: BraveWalletSolanaTxManagerProxy, ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A, bitcoinWalletService: BraveWalletBitcoinWalletService, zcashWalletService: BraveWalletZCashWalletService, meldIntegrationService: BraveWalletMeldIntegrationService, @@ -165,7 +163,6 @@ public class CryptoStore: ObservableObject, WalletObserverStore { self.ethTxManagerProxy = ethTxManagerProxy self.solTxManagerProxy = solTxManagerProxy self.ipfsApi = ipfsApi - self.walletP3A = walletP3A self.bitcoinWalletService = bitcoinWalletService self.zcashWalletService = zcashWalletService self.meldIntegrationService = meldIntegrationService @@ -206,7 +203,6 @@ public class CryptoStore: ObservableObject, WalletObserverStore { assetRatioService: assetRatioService, blockchainRegistry: blockchainRegistry, ipfsApi: ipfsApi, - walletP3A: walletP3A, userAssetManager: userAssetManager, txService: txService ) diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift index ea0d0bb9b79..9991a35ff79 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift @@ -173,7 +173,6 @@ public class KeyringStore: ObservableObject, WalletObserverStore { private let keyringService: BraveWalletKeyringService private let walletService: BraveWalletBraveWalletService private let rpcService: BraveWalletJsonRpcService - private let walletP3A: BraveWalletBraveWalletP3A private var cancellable: AnyCancellable? private let keychain: KeychainType private var keyringServiceObserver: KeyringServiceObserver? @@ -187,13 +186,11 @@ public class KeyringStore: ObservableObject, WalletObserverStore { keyringService: BraveWalletKeyringService, walletService: BraveWalletBraveWalletService, rpcService: BraveWalletJsonRpcService, - walletP3A: BraveWalletBraveWalletP3A, keychain: KeychainType = Keychain() ) { self.keyringService = keyringService self.walletService = walletService self.rpcService = rpcService - self.walletP3A = walletP3A self.keychain = keychain setupObservers() diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift index cbdb5c4734d..4b25f4b537d 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/NFTStore.swift @@ -134,7 +134,6 @@ public class NFTStore: ObservableObject, WalletObserverStore { private let assetRatioService: BraveWalletAssetRatioService private let blockchainRegistry: BraveWalletBlockchainRegistry private let ipfsApi: IpfsAPI - private let walletP3A: BraveWalletBraveWalletP3A private let assetManager: WalletUserAssetManagerType private let txService: BraveWalletTxService private var rpcServiceObserver: JsonRpcServiceObserver? @@ -176,7 +175,6 @@ public class NFTStore: ObservableObject, WalletObserverStore { assetRatioService: BraveWalletAssetRatioService, blockchainRegistry: BraveWalletBlockchainRegistry, ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A, userAssetManager: WalletUserAssetManagerType, txService: BraveWalletTxService ) { @@ -186,7 +184,6 @@ public class NFTStore: ObservableObject, WalletObserverStore { self.assetRatioService = assetRatioService self.blockchainRegistry = blockchainRegistry self.ipfsApi = ipfsApi - self.walletP3A = walletP3A self.assetManager = userAssetManager self.txService = txService diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/WalletStore.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/WalletStore.swift index 658844f384e..9347e17634c 100644 --- a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/WalletStore.swift +++ b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/WalletStore.swift @@ -73,7 +73,6 @@ public class WalletStore { ethTxManagerProxy: BraveWalletEthTxManagerProxy, solTxManagerProxy: BraveWalletSolanaTxManagerProxy, ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A, bitcoinWalletService: BraveWalletBitcoinWalletService, zcashWalletService: BraveWalletZCashWalletService, meldIntegrationService: BraveWalletMeldIntegrationService, @@ -82,8 +81,7 @@ public class WalletStore { self.keyringStore = .init( keyringService: keyringService, walletService: walletService, - rpcService: rpcService, - walletP3A: walletP3A + rpcService: rpcService ) self.setUp( keyringService: keyringService, @@ -96,7 +94,6 @@ public class WalletStore { ethTxManagerProxy: ethTxManagerProxy, solTxManagerProxy: solTxManagerProxy, ipfsApi: ipfsApi, - walletP3A: walletP3A, bitcoinWalletService: bitcoinWalletService, zcashWalletService: zcashWalletService, meldIntegrationService: meldIntegrationService, @@ -125,7 +122,6 @@ public class WalletStore { ethTxManagerProxy: BraveWalletEthTxManagerProxy, solTxManagerProxy: BraveWalletSolanaTxManagerProxy, ipfsApi: IpfsAPI, - walletP3A: BraveWalletBraveWalletP3A, bitcoinWalletService: BraveWalletBitcoinWalletService, zcashWalletService: BraveWalletZCashWalletService, meldIntegrationService: BraveWalletMeldIntegrationService, @@ -152,7 +148,6 @@ public class WalletStore { ethTxManagerProxy: ethTxManagerProxy, solTxManagerProxy: solTxManagerProxy, ipfsApi: ipfsApi, - walletP3A: walletP3A, bitcoinWalletService: bitcoinWalletService, zcashWalletService: zcashWalletService, meldIntegrationService: meldIntegrationService, diff --git a/ios/brave-ios/Sources/BraveWallet/PreviewContent/MockStores.swift b/ios/brave-ios/Sources/BraveWallet/PreviewContent/MockStores.swift index 7f7db2a5289..1f5eb47233e 100644 --- a/ios/brave-ios/Sources/BraveWallet/PreviewContent/MockStores.swift +++ b/ios/brave-ios/Sources/BraveWallet/PreviewContent/MockStores.swift @@ -23,7 +23,6 @@ extension WalletStore { ethTxManagerProxy: MockEthTxManagerProxy(), solTxManagerProxy: BraveWallet.TestSolanaTxManagerProxy.previewProxy, ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), bitcoinWalletService: BraveWallet.TestBitcoinWalletService(), zcashWalletService: BraveWallet.TestZCashWalletService(), meldIntegrationService: BraveWallet.TestMeldIntegrationService(), @@ -45,7 +44,6 @@ extension CryptoStore { ethTxManagerProxy: MockEthTxManagerProxy(), solTxManagerProxy: BraveWallet.TestSolanaTxManagerProxy.previewProxy, ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), bitcoinWalletService: BraveWallet.TestBitcoinWalletService.previewBitcoinWalletService, zcashWalletService: BraveWallet.TestZCashWalletService.previewZCashWalletService, meldIntegrationService: BraveWallet.TestMeldIntegrationService.previewMeldIntegrationService, @@ -103,8 +101,7 @@ extension KeyringStore { .init( keyringService: MockKeyringService(), walletService: MockBraveWalletService(), - rpcService: MockJsonRpcService(), - walletP3A: TestBraveWalletP3A() + rpcService: MockJsonRpcService() ) } static var previewStoreWithWalletCreated: KeyringStore { diff --git a/ios/brave-ios/Sources/BraveWallet/PreviewContent/TestBraveWalletP3A.swift b/ios/brave-ios/Sources/BraveWallet/PreviewContent/TestBraveWalletP3A.swift deleted file mode 100644 index a7f7e96a2ec..00000000000 --- a/ios/brave-ios/Sources/BraveWallet/PreviewContent/TestBraveWalletP3A.swift +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2024 The Brave Authors. All rights reserved. -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -import BraveCore - -#if DEBUG - -class TestBraveWalletP3A: BraveWalletBraveWalletP3A { - -} - -#endif diff --git a/ios/brave-ios/Tests/BraveWalletTests/KeyringStoreTests.swift b/ios/brave-ios/Tests/BraveWalletTests/KeyringStoreTests.swift index a84610e06ba..2c2292ef9f4 100644 --- a/ios/brave-ios/Tests/BraveWalletTests/KeyringStoreTests.swift +++ b/ios/brave-ios/Tests/BraveWalletTests/KeyringStoreTests.swift @@ -55,8 +55,7 @@ class KeyringStoreTests: XCTestCase { let store = KeyringStore( keyringService: keyringService, walletService: walletService, - rpcService: rpcService, - walletP3A: TestBraveWalletP3A() + rpcService: rpcService ) let initalSelectedAccountExpectation = expectation(description: "initalSelectedAccount") @@ -83,8 +82,7 @@ class KeyringStoreTests: XCTestCase { let store = KeyringStore( keyringService: keyringService, walletService: walletService, - rpcService: rpcService, - walletP3A: TestBraveWalletP3A() + rpcService: rpcService ) let emptyPassword1 = "" diff --git a/ios/brave-ios/Tests/BraveWalletTests/ManageSiteConnectionsStoreTests.swift b/ios/brave-ios/Tests/BraveWalletTests/ManageSiteConnectionsStoreTests.swift index 1686722eea6..7b755d76475 100644 --- a/ios/brave-ios/Tests/BraveWalletTests/ManageSiteConnectionsStoreTests.swift +++ b/ios/brave-ios/Tests/BraveWalletTests/ManageSiteConnectionsStoreTests.swift @@ -122,8 +122,7 @@ class ManageSiteConnectionsStoreTests: CoreDataTestCase { keyringStore: .init( keyringService: keyringService, walletService: MockBraveWalletService(), - rpcService: MockJsonRpcService(), - walletP3A: TestBraveWalletP3A() + rpcService: MockJsonRpcService() ) ) // Domains added with Ethereum permissions in `setUp()` @@ -188,8 +187,7 @@ class ManageSiteConnectionsStoreTests: CoreDataTestCase { keyringStore: .init( keyringService: keyringService, walletService: MockBraveWalletService(), - rpcService: MockJsonRpcService(), - walletP3A: TestBraveWalletP3A() + rpcService: MockJsonRpcService() ) ) // Domains added with Ethereum permissions in `setUp()` @@ -229,8 +227,7 @@ class ManageSiteConnectionsStoreTests: CoreDataTestCase { keyringStore: .init( keyringService: keyringService, walletService: MockBraveWalletService(), - rpcService: MockJsonRpcService(), - walletP3A: TestBraveWalletP3A() + rpcService: MockJsonRpcService() ) ) // Domains added with Ethereum permissions in `setUp()` @@ -276,8 +273,7 @@ class ManageSiteConnectionsStoreTests: CoreDataTestCase { keyringStore: .init( keyringService: keyringService, walletService: MockBraveWalletService(), - rpcService: MockJsonRpcService(), - walletP3A: TestBraveWalletP3A() + rpcService: MockJsonRpcService() ) ) // Domains added with Ethereum permissions in `setUp()` diff --git a/ios/brave-ios/Tests/BraveWalletTests/NFTStoreTests.swift b/ios/brave-ios/Tests/BraveWalletTests/NFTStoreTests.swift index f62f0f4027f..b089325cdbd 100644 --- a/ios/brave-ios/Tests/BraveWalletTests/NFTStoreTests.swift +++ b/ios/brave-ios/Tests/BraveWalletTests/NFTStoreTests.swift @@ -285,7 +285,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -501,7 +500,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -587,7 +585,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -661,7 +658,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -745,7 +741,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -821,7 +816,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -920,7 +914,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -1056,7 +1049,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) @@ -1153,7 +1145,6 @@ class NFTStoreTests: XCTestCase { assetRatioService: assetRatioService, blockchainRegistry: BraveWallet.TestBlockchainRegistry(), ipfsApi: TestIpfsAPI(), - walletP3A: TestBraveWalletP3A(), userAssetManager: mockAssetManager, txService: txService ) diff --git a/ios/browser/api/brave_wallet/brave_wallet_api.h b/ios/browser/api/brave_wallet/brave_wallet_api.h index dc3224ac3e9..1353fd4f251 100644 --- a/ios/browser/api/brave_wallet/brave_wallet_api.h +++ b/ios/browser/api/brave_wallet/brave_wallet_api.h @@ -14,7 +14,6 @@ @protocol BraveWalletProviderDelegate; @protocol BraveWalletSolanaProvider; @protocol BraveWalletCardanoProvider; -@protocol BraveWalletBraveWalletP3A; typedef NS_ENUM(NSInteger, BraveWalletCoinType); @@ -61,8 +60,6 @@ OBJC_EXPORT - (NSDictionary*) providerScriptsForCoinType:(BraveWalletCoinType)coinType; -- (nullable id)walletP3A; - - (instancetype)init NS_UNAVAILABLE; @end diff --git a/ios/browser/api/brave_wallet/brave_wallet_api.mm b/ios/browser/api/brave_wallet/brave_wallet_api.mm index e58c493c7ad..bdeffce70a2 100644 --- a/ios/browser/api/brave_wallet/brave_wallet_api.mm +++ b/ios/browser/api/brave_wallet/brave_wallet_api.mm @@ -8,7 +8,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/sys_string_conversions.h" #include "brave/components/brave_wallet/browser/blockchain_registry.h" -#include "brave/components/brave_wallet/browser/brave_wallet_p3a.h" #include "brave/components/brave_wallet/browser/brave_wallet_service.h" #include "brave/components/brave_wallet/browser/brave_wallet_utils.h" #include "brave/components/brave_wallet/browser/cardano/cardano_provider_impl.h" @@ -236,17 +235,4 @@ BraveWalletProviderScriptKey const BraveWalletProviderScriptKeyWalletStandard = return scripts; } -- (nullable id)walletP3A { - auto* service = - brave_wallet::BraveWalletServiceFactory::GetServiceForState(_profile); - if (!service) { - return nil; - } - - mojo::PendingRemote pending_remote; - service->Bind(pending_remote.InitWithNewPipeAndPassReceiver()); - return [[BraveWalletBraveWalletP3AMojoImpl alloc] - initWithBraveWalletP3A:std::move(pending_remote)]; -} - @end diff --git a/ios/browser/ui/webui/brave_wallet/wallet_page_ui.h b/ios/browser/ui/webui/brave_wallet/wallet_page_ui.h index 2cccabf03d6..c6f3c3a4b62 100644 --- a/ios/browser/ui/webui/brave_wallet/wallet_page_ui.h +++ b/ios/browser/ui/webui/brave_wallet/wallet_page_ui.h @@ -63,8 +63,6 @@ class WalletPageUI : public web::WebUIIOSController, bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service, - mojo::PendingReceiver - brave_wallet_p3a, mojo::PendingReceiver brave_wallet_ipfs_service_receiver, mojo::PendingReceiver diff --git a/ios/browser/ui/webui/brave_wallet/wallet_page_ui.mm b/ios/browser/ui/webui/brave_wallet/wallet_page_ui.mm index eca19f8facd..c01c6c5095b 100644 --- a/ios/browser/ui/webui/brave_wallet/wallet_page_ui.mm +++ b/ios/browser/ui/webui/brave_wallet/wallet_page_ui.mm @@ -126,7 +126,6 @@ void WalletPageUI::CreatePageHandler( bitcoin_tx_manager_proxy_receiver, mojo::PendingReceiver brave_wallet_service, - mojo::PendingReceiver brave_wallet_p3a, mojo::PendingReceiver brave_wallet_ipfs_service_receiver, mojo::PendingReceiver @@ -152,7 +151,6 @@ void WalletPageUI::CreatePageHandler( wallet_service->Bind(std::move(solana_tx_manager_proxy)); wallet_service->Bind(std::move(filecoin_tx_manager_proxy)); wallet_service->Bind(std::move(bitcoin_tx_manager_proxy_receiver)); - wallet_service->Bind(std::move(brave_wallet_p3a)); wallet_service->Bind(std::move(swap_service)); wallet_service->Bind(std::move(asset_ratio_service)); wallet_service->Bind(std::move(meld_integration_service));