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

Jupiter desktop integration for Solana swaps #14298

Merged
merged 1 commit into from
Aug 12, 2022
+1,436 −411
Merged

Jupiter desktop integration for Solana swaps #14298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions android/java/org/chromium/chrome/browser/app/domain/SendModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void sendSolanaToken(BlockchainToken token, String fromAddress, String to
if (error == 0) {
mTxService.addUnapprovedTransaction(
WalletUtils.toTxDataUnion(solanaTxData), fromAddress, null,
(success, txMetaId, errorMessage) -> {
null, (success, txMetaId, errorMessage) -> {
callback.call(success, txMetaId, errorMessage);
});
}
Expand All @@ -88,7 +88,7 @@ public void sendSolanaToken(BlockchainToken token, String fromAddress, String to
if (error == 0) {
mTxService.addUnapprovedTransaction(
WalletUtils.toTxDataUnion(solanaTxData), fromAddress, null,
(success, txMetaId, errorMessage) -> {
null, (success, txMetaId, errorMessage) -> {
callback.call(success, txMetaId, errorMessage);
});
}
Expand Down
2 changes: 1 addition & 1 deletion android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ private void sendTransaction(
txDataUnion.setEthTxData(data);
}
mTxService.addUnapprovedTransaction(
txDataUnion, from, null, (success, tx_meta_id, error_message) -> {
txDataUnion, from, null, null, (success, tx_meta_id, error_message) -> {
// Do nothing here when success as we will receive an
// unapproved transaction in TxServiceObserver.
// When we have error, let the user know,
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -102,6 +102,8 @@ constexpr webui::LocalizedString kLocalizedStrings[] = {
{"braveWalletSwapDisclaimer", IDS_BRAVE_WALLET_SWAP_DISCLAIMER},
{"braveWalletSwapDisclaimerDescription",
IDS_BRAVE_WALLET_SWAP_DISCLAIMER_DESCRIPTION},
{"braveWalletJupiterSwapDisclaimerDescription",
IDS_BRAVE_WALLET_JUPITER_SWAP_DISCLAIMER_DESCRIPTION},
{"braveWalletSwapFeesNotice", IDS_BRAVE_WALLET_SWAP_FEES_NOTICE},
{"braveWalletDecimalPlacesError", IDS_BRAVE_WALLET_DECIMAL_PLACES_ERROR},
{"braveWalletCreateAccountDescription",
Expand Down
84 changes: 47 additions & 37 deletions components/brave_wallet/browser/eth_tx_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,25 +135,28 @@ void EthTxManager::AddUnapprovedTransaction(
mojom::TxDataUnionPtr tx_data_union,
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
AddUnapprovedTransactionCallback callback) {
DCHECK(tx_data_union->is_eth_tx_data() ||
tx_data_union->is_eth_tx_data_1559());
auto origin_val =
origin.value_or(url::Origin::Create(GURL("chrome://wallet")));
if (tx_data_union->is_eth_tx_data()) {
AddUnapprovedTransaction(std::move(tx_data_union->get_eth_tx_data()), from,
std::move(origin_val), std::move(callback));
std::move(origin_val), group_id,
std::move(callback));
} else {
AddUnapproved1559Transaction(
std::move(tx_data_union->get_eth_tx_data_1559()), from,
std::move(origin_val), std::move(callback));
std::move(origin_val), group_id, std::move(callback));
}
}

void EthTxManager::AddUnapprovedTransaction(
mojom::TxDataPtr tx_data,
const std::string& from,
const url::Origin& origin,
const absl::optional<std::string>& group_id,
AddUnapprovedTransactionCallback callback) {
if (from.empty()) {
std::move(callback).Run(
Expand Down Expand Up @@ -182,19 +185,19 @@ void EthTxManager::AddUnapprovedTransaction(
const std::string data = tx_data->data.empty() ? "" : ToHex(tx_data->data);

if (!tx_ptr->gas_price()) {
json_rpc_service_->GetGasPrice(
base::BindOnce(&EthTxManager::OnGetGasPrice, weak_factory_.GetWeakPtr(),
from, origin, tx_data->to, tx_data->value, data,
gas_limit, std::move(tx_ptr), std::move(callback)));
json_rpc_service_->GetGasPrice(base::BindOnce(
&EthTxManager::OnGetGasPrice, weak_factory_.GetWeakPtr(), from, origin,
tx_data->to, tx_data->value, data, gas_limit, group_id,
std::move(tx_ptr), std::move(callback)));
} else if (!tx_ptr->gas_limit()) {
json_rpc_service_->GetEstimateGas(
from, tx_data->to, "" /* gas */, "" /* gas_price */, tx_data->value,
data,
base::BindOnce(&EthTxManager::ContinueAddUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin,
weak_factory_.GetWeakPtr(), from, origin, group_id,
std::move(tx_ptr), std::move(callback)));
} else {
ContinueAddUnapprovedTransaction(from, origin, std::move(tx_ptr),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx_ptr),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}
Expand All @@ -206,6 +209,7 @@ void EthTxManager::OnGetGasPrice(const std::string& from,
const std::string& value,
const std::string& data,
const std::string& gas_limit,
const absl::optional<std::string>& group_id,
std::unique_ptr<EthTransaction> tx,
AddUnapprovedTransactionCallback callback,
const std::string& result,
Expand All @@ -226,10 +230,10 @@ void EthTxManager::OnGetGasPrice(const std::string& from,
json_rpc_service_->GetEstimateGas(
from, to, "" /* gas */, "" /* gas_price */, value, data,
base::BindOnce(&EthTxManager::ContinueAddUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin, std::move(tx),
std::move(callback)));
weak_factory_.GetWeakPtr(), from, origin, group_id,
std::move(tx), std::move(callback)));
} else {
ContinueAddUnapprovedTransaction(from, origin, std::move(tx),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}
Expand All @@ -238,6 +242,7 @@ void EthTxManager::OnGetGasPrice(const std::string& from,
void EthTxManager::ContinueAddUnapprovedTransaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
std::unique_ptr<EthTransaction> tx,
AddUnapprovedTransactionCallback callback,
const std::string& result,
Expand Down Expand Up @@ -272,6 +277,7 @@ void EthTxManager::ContinueAddUnapprovedTransaction(
meta.set_id(TxMeta::GenerateMetaID());
meta.set_from(EthAddress::FromHex(from).ToChecksumAddress());
meta.set_origin(origin);
meta.set_group_id(group_id);
meta.set_created_time(base::Time::Now());
meta.set_status(mojom::TransactionStatus::Unapproved);
tx_state_manager_->AddOrUpdateTx(meta);
Expand All @@ -282,6 +288,7 @@ void EthTxManager::AddUnapproved1559Transaction(
mojom::TxData1559Ptr tx_data,
const std::string& from,
const url::Origin& origin,
const absl::optional<std::string>& group_id,
AddUnapprovedTransactionCallback callback) {
if (from.empty()) {
std::move(callback).Run(
Expand Down Expand Up @@ -311,20 +318,20 @@ void EthTxManager::AddUnapproved1559Transaction(
tx_data->base_data->data.empty() ? "" : ToHex(tx_data->base_data->data);

if (!tx_ptr->max_priority_fee_per_gas() || !tx_ptr->max_fee_per_gas()) {
GetGasEstimation1559(
base::BindOnce(&EthTxManager::OnGetGasOracleForUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin,
tx_data->base_data->to, tx_data->base_data->value, data,
gas_limit, std::move(tx_ptr), std::move(callback)));
GetGasEstimation1559(base::BindOnce(
&EthTxManager::OnGetGasOracleForUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin, tx_data->base_data->to,
tx_data->base_data->value, data, gas_limit, group_id, std::move(tx_ptr),
std::move(callback)));
} else if (gas_limit.empty()) {
json_rpc_service_->GetEstimateGas(
from, tx_data->base_data->to, "" /* gas */, "" /* gas_price */,
tx_data->base_data->value, data,
base::BindOnce(&EthTxManager::ContinueAddUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin,
weak_factory_.GetWeakPtr(), from, origin, group_id,
std::move(tx_ptr), std::move(callback)));
} else {
ContinueAddUnapprovedTransaction(from, origin, std::move(tx_ptr),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx_ptr),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}
Expand All @@ -337,6 +344,7 @@ void EthTxManager::OnGetGasOracleForUnapprovedTransaction(
const std::string& value,
const std::string& data,
const std::string& gas_limit,
const absl::optional<std::string>& group_id,
std::unique_ptr<Eip1559Transaction> tx,
AddUnapprovedTransactionCallback callback,
mojom::GasEstimation1559Ptr gas_estimation) {
Expand All @@ -358,10 +366,10 @@ void EthTxManager::OnGetGasOracleForUnapprovedTransaction(
json_rpc_service_->GetEstimateGas(
from, to, "" /* gas */, "" /* gas_price */, value, data,
base::BindOnce(&EthTxManager::ContinueAddUnapprovedTransaction,
weak_factory_.GetWeakPtr(), from, origin, std::move(tx),
std::move(callback)));
weak_factory_.GetWeakPtr(), from, origin, group_id,
std::move(tx), std::move(callback)));
} else {
ContinueAddUnapprovedTransaction(from, origin, std::move(tx),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}
Expand Down Expand Up @@ -912,11 +920,11 @@ void EthTxManager::SpeedupOrCancelTransaction(
tx->set_data(std::vector<uint8_t>());
}

GetGasEstimation1559(
base::BindOnce(&EthTxManager::ContinueSpeedupOrCancel1559Transaction,
weak_factory_.GetWeakPtr(), meta->from(), meta->origin(),
Uint256ValueToHex(meta->tx()->gas_limit()),
std::move(tx), std::move(callback)));
GetGasEstimation1559(base::BindOnce(
&EthTxManager::ContinueSpeedupOrCancel1559Transaction,
weak_factory_.GetWeakPtr(), meta->from(), meta->origin(),
meta->group_id(), Uint256ValueToHex(meta->tx()->gas_limit()),
std::move(tx), std::move(callback)));
} else {
auto tx = std::make_unique<EthTransaction>(*meta->tx());
if (cancel) {
Expand All @@ -933,17 +941,18 @@ void EthTxManager::SpeedupOrCancelTransaction(
return;
}

json_rpc_service_->GetGasPrice(
base::BindOnce(&EthTxManager::ContinueSpeedupOrCancelTransaction,
weak_factory_.GetWeakPtr(), meta->from(), meta->origin(),
Uint256ValueToHex(meta->tx()->gas_limit()),
std::move(tx), std::move(callback)));
json_rpc_service_->GetGasPrice(base::BindOnce(
&EthTxManager::ContinueSpeedupOrCancelTransaction,
weak_factory_.GetWeakPtr(), meta->from(), meta->origin(),
meta->group_id(), Uint256ValueToHex(meta->tx()->gas_limit()),
std::move(tx), std::move(callback)));
}
}

void EthTxManager::ContinueSpeedupOrCancelTransaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
const std::string& gas_limit,
std::unique_ptr<EthTransaction> tx,
SpeedupOrCancelTransactionCallback callback,
Expand Down Expand Up @@ -976,14 +985,15 @@ void EthTxManager::ContinueSpeedupOrCancelTransaction(
static_cast<uint64_t>(tx->gas_price()) * 11ULL / 10ULL;
tx->set_gas_price(std::max(latest_estimate_gas_price, increased_gas_price));

ContinueAddUnapprovedTransaction(from, origin, std::move(tx),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}

void EthTxManager::ContinueSpeedupOrCancel1559Transaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
const std::string& gas_limit,
std::unique_ptr<Eip1559Transaction> tx,
SpeedupOrCancelTransactionCallback callback,
Expand Down Expand Up @@ -1022,7 +1032,7 @@ void EthTxManager::ContinueSpeedupOrCancel1559Transaction(
std::max(estimation->avg_max_priority_fee_per_gas,
increased_max_priority_fee_per_gas));

ContinueAddUnapprovedTransaction(from, origin, std::move(tx),
ContinueAddUnapprovedTransaction(from, origin, group_id, std::move(tx),
std::move(callback), gas_limit,
mojom::ProviderError::kSuccess, "");
}
Expand All @@ -1046,10 +1056,10 @@ void EthTxManager::RetryTransaction(const std::string& tx_meta_id,
tx = std::make_unique<EthTransaction>(*meta->tx());
}

ContinueAddUnapprovedTransaction(meta->from(), meta->origin(), std::move(tx),
std::move(callback),
Uint256ValueToHex(meta->tx()->gas_limit()),
mojom::ProviderError::kSuccess, "");
ContinueAddUnapprovedTransaction(
meta->from(), meta->origin(), meta->group_id(), std::move(tx),
std::move(callback), Uint256ValueToHex(meta->tx()->gas_limit()),
mojom::ProviderError::kSuccess, "");
}

void EthTxManager::GetGasEstimation1559(GetGasEstimation1559Callback callback) {
Expand Down
8 changes: 8 additions & 0 deletions components/brave_wallet/browser/eth_tx_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
void AddUnapprovedTransaction(mojom::TxDataUnionPtr tx_data_union,
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& groupId,
AddUnapprovedTransactionCallback) override;
void ApproveTransaction(const std::string& tx_meta_id,
ApproveTransactionCallback) override;
Expand Down Expand Up @@ -153,10 +154,12 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
void AddUnapprovedTransaction(mojom::TxDataPtr tx_data,
const std::string& from,
const url::Origin& origin,
const absl::optional<std::string>& groupId,
AddUnapprovedTransactionCallback);
void AddUnapproved1559Transaction(mojom::TxData1559Ptr tx_data,
const std::string& from,
const url::Origin& origin,
const absl::optional<std::string>& groupId,
AddUnapprovedTransactionCallback);

void NotifyUnapprovedTxUpdated(TxMeta* meta);
Expand Down Expand Up @@ -185,6 +188,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
const std::string& value,
const std::string& data,
const std::string& gas_limit,
const absl::optional<std::string>& group_id,
std::unique_ptr<EthTransaction> tx,
AddUnapprovedTransactionCallback callback,
const std::string& result,
Expand All @@ -193,6 +197,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
void ContinueAddUnapprovedTransaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
std::unique_ptr<EthTransaction> tx,
AddUnapprovedTransactionCallback callback,
const std::string& result,
Expand All @@ -213,6 +218,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
const std::string& value,
const std::string& data,
const std::string& gas_limit,
const absl::optional<std::string>& group_id,
std::unique_ptr<Eip1559Transaction> tx,
AddUnapprovedTransactionCallback callback,
mojom::GasEstimation1559Ptr gas_estimation);
Expand All @@ -221,6 +227,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
void ContinueSpeedupOrCancelTransaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
const std::string& gas_limit,
std::unique_ptr<EthTransaction> tx,
SpeedupOrCancelTransactionCallback callback,
Expand All @@ -230,6 +237,7 @@ class EthTxManager : public TxManager, public EthBlockTracker::Observer {
void ContinueSpeedupOrCancel1559Transaction(
const std::string& from,
const absl::optional<url::Origin>& origin,
const absl::optional<std::string>& group_id,
const std::string& gas_limit,
std::unique_ptr<Eip1559Transaction> tx,
SpeedupOrCancelTransactionCallback callback,
Expand Down
Loading