Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Jan 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e235146
chore(wallet): migrate to Blowfish API v2023-06-05
onyb Jan 2, 2024
1e230b6
review(supermassive): remove deprecated blowfish warnings
onyb Jan 18, 2024
fdb6f53
review(supermassive): do not use Elvis operator
onyb Jan 19, 2024
99e1648
review(supermassive): add DCHECK
onyb Jan 19, 2024
bd72222
Fix storybook
onyb Jan 19, 2024
801ad4d
Fix mojo error in iOS due to nullable enum field
onyb Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/brave_wallet/browser/brave_wallet_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
23 changes: 18 additions & 5 deletions components/brave_wallet/browser/simulation_request_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions components/brave_wallet/browser/simulation_request_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading