chore(wallet): migrate to Blowfish API v2023-06-05 (#21609)

* chore(wallet): migrate to Blowfish API v2023-06-05 * review(supermassive): remove deprecated blowfish warnings * review(supermassive): do not use Elvis operator * review(supermassive): add DCHECK * Fix storybook * Fix mojo error in iOS due to nullable enum field
brave · Jan 19, 2024 · 5a9ba3f · 5a9ba3f
1 parent a544623
commit 5a9ba3f
Show file tree

Hide file tree

Showing 14 changed files with 2,281 additions and 1,987 deletions.
diff --git a/components/brave_wallet/browser/brave_wallet_constants.h b/components/brave_wallet/browser/brave_wallet_constants.h
@@ -1406,7 +1406,7 @@ inline constexpr char kJupiterReferralProgramHeader[] = "referral_ata";
 inline constexpr char kBlowfishBaseAPIURL[] =
     "https://blowfish.wallet.brave.com";
 inline constexpr char kBlowfishAPIVersionHeader[] = "X-Api-Version";
-inline constexpr char kBlowfishAPIVersion[] = "2023-03-08";
+inline constexpr char kBlowfishAPIVersion[] = "2023-06-05";
 
 constexpr int64_t kBlockTrackerDefaultTimeInSeconds = 20;
 constexpr int64_t kLogTrackerDefaultTimeInSeconds = 20;

diff --git a/components/brave_wallet/browser/simulation_request_helper.cc b/components/brave_wallet/browser/simulation_request_helper.cc
@@ -42,7 +42,7 @@ base::Value::Dict GetMetadata(const mojom::OriginInfoPtr& origin_info) {
 
 namespace evm {
 
-std::optional<std::string> EncodeScanTransactionParams(
+std::optional<std::pair<std::string, std::string>> EncodeScanTransactionParams(
     const mojom::TransactionInfoPtr& tx_info) {
   if (!tx_info || !tx_info->from_address) {
     return std::nullopt;
@@ -101,11 +101,19 @@ std::optional<std::string> EncodeScanTransactionParams(
   }
 
   base::Value::Dict params;
-  params.Set("txObject", std::move(tx_object));
+
+  base::Value::List tx_objects;
+  tx_objects.Append(std::move(tx_object));
+  params.Set("txObjects", std::move(tx_objects));
   params.Set("metadata", GetMetadata(tx_info->origin_info));
   params.Set("userAccount", *tx_info->from_address);
 
-  return GetJSON(base::Value(std::move(params)));
+  if (auto* user_account = params.FindString("userAccount")) {
+    return std::make_pair(GetJSON(base::Value(std::move(params))),
+                          *user_account);
+  }
+
+  return std::nullopt;
 }
 
 }  // namespace evm
@@ -153,7 +161,7 @@ std::optional<std::string> GetBase64TransactionFromTxDataUnion(
 
 }  // namespace
 
-std::optional<std::string> EncodeScanTransactionParams(
+std::optional<std::pair<std::string, std::string>> EncodeScanTransactionParams(
     const mojom::SolanaTransactionRequestUnionPtr& request) {
   if (!request) {
     return std::nullopt;
@@ -217,7 +225,12 @@ std::optional<std::string> EncodeScanTransactionParams(
     return std::nullopt;
   }
 
-  return GetJSON(base::Value(std::move(params)));
+  if (auto* user_account = params.FindString("userAccount")) {
+    return std::make_pair(GetJSON(base::Value(std::move(params))),
+                          *user_account);
+  }
+
+  return std::nullopt;
 }
 
 }  // namespace solana

diff --git a/components/brave_wallet/browser/simulation_request_helper.h b/components/brave_wallet/browser/simulation_request_helper.h
@@ -8,21 +8,22 @@
 
 #include <optional>
 #include <string>
+#include <utility>
 
 #include "brave/components/brave_wallet/common/brave_wallet.mojom.h"
 
 namespace brave_wallet {
 
 namespace evm {
 
-std::optional<std::string> EncodeScanTransactionParams(
+std::optional<std::pair<std::string, std::string>> EncodeScanTransactionParams(
     const mojom::TransactionInfoPtr& tx_info);
 
 }  // namespace evm
 
 namespace solana {
 
-std::optional<std::string> EncodeScanTransactionParams(
+std::optional<std::pair<std::string, std::string>> EncodeScanTransactionParams(
     const mojom::SolanaTransactionRequestUnionPtr& request);
 
 }  // namespace solana