From 91447f0a66c39b4be975b5079ffebb6c6ff9eb07 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Mon, 17 Aug 2020 06:56:26 +0000 Subject: [PATCH 1/2] Uplift of #6384 (squashed) to beta --- .../src/bat/ledger/internal/response/response_wallet.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/response/response_wallet.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/response/response_wallet.cc index 92cab7d0a92b..db4e1cc6a4c7 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/response/response_wallet.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/response/response_wallet.cc @@ -139,7 +139,7 @@ ledger::Result ParseRecoverWallet( // POST /v3/wallet/uphold/{payment_id}/claim // // Success: -// OK (201) +// OK (200) // // Response Format: // {Empty body} @@ -175,7 +175,7 @@ ledger::Result CheckClaimWallet(const ledger::UrlResponse& response) { return ledger::Result::LEDGER_ERROR; } - if (response.status_code != net::HTTP_CREATED) { + if (response.status_code != net::HTTP_OK) { return ledger::Result::LEDGER_ERROR; } From 513eb3640ba1bd6bbe43ab3bf73c7f6b0920985b Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Tue, 11 Aug 2020 14:29:17 +0200 Subject: [PATCH 2/2] Removes annon address from external wallet flow Resolves https://github.com/brave/brave-browser/issues/11150 --- .../brave_rewards/browser/external_wallet.cc | 1 - .../brave_rewards/browser/external_wallet.h | 1 - .../browser/rewards_service_impl.cc | 7 - .../common/rewards_browsertest_response.cc | 9 - .../common/rewards_browsertest_response.h | 1 - .../rewards-data/uphold_addresses_resp.json | 11 -- .../bat/ledger/public/interfaces/ledger.mojom | 1 - .../ledger/internal/state/state_migration.cc | 2 +- .../internal/state/state_migration_v3.cc | 31 +--- .../internal/state/state_migration_v3.h | 12 +- .../src/bat/ledger/internal/uphold/uphold.cc | 4 - .../src/bat/ledger/internal/uphold/uphold.h | 2 - .../bat/ledger/internal/uphold/uphold_card.cc | 161 ------------------ .../bat/ledger/internal/uphold/uphold_card.h | 26 --- .../ledger/internal/wallet/wallet_claim.cc | 28 +-- .../bat/ledger/internal/wallet/wallet_claim.h | 1 - .../BATExternalWallet+DictionaryValue.mm | 6 +- 17 files changed, 9 insertions(+), 295 deletions(-) delete mode 100644 test/data/rewards-data/uphold_addresses_resp.json diff --git a/components/brave_rewards/browser/external_wallet.cc b/components/brave_rewards/browser/external_wallet.cc index 21431786cce4..d9e700105072 100644 --- a/components/brave_rewards/browser/external_wallet.cc +++ b/components/brave_rewards/browser/external_wallet.cc @@ -22,7 +22,6 @@ namespace brave_rewards { base::Value dict(base::Value::Type::DICTIONARY); dict.SetStringKey("token", token); dict.SetStringKey("address", address); - dict.SetStringKey("anon_address", anon_address); // enum class WalletStatus : int32_t dict.SetIntKey("status", static_cast(status)); diff --git a/components/brave_rewards/browser/external_wallet.h b/components/brave_rewards/browser/external_wallet.h index 72ceb8085406..c7e9517acc7b 100644 --- a/components/brave_rewards/browser/external_wallet.h +++ b/components/brave_rewards/browser/external_wallet.h @@ -18,7 +18,6 @@ struct ExternalWallet { std::string token; std::string address; - std::string anon_address; uint32_t status; std::string type; std::string verify_url; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 9407a4ec7dc8..f45f72309da5 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -3186,7 +3186,6 @@ void RewardsServiceImpl::SaveExternalWallet(const std::string& wallet_type, new_wallet.SetStringKey("withdraw_url", wallet->withdraw_url); new_wallet.SetStringKey("account_url", wallet->account_url); new_wallet.SetStringKey("login_url", wallet->login_url); - new_wallet.SetStringKey("anon_address", wallet->anon_address); new_wallets.SetKey(wallet_type, std::move(new_wallet)); @@ -3255,11 +3254,6 @@ RewardsServiceImpl::GetExternalWallets() { wallet->login_url = *login_url; } - auto* anon_address = it.second.FindStringKey("anon_address"); - if (anon_address) { - wallet->anon_address = *anon_address; - } - wallets.insert(std::make_pair(it.first, std::move(wallet))); } @@ -3285,7 +3279,6 @@ void RewardsServiceImpl::OnGetExternalWallet( external->user_name = wallet->user_name; external->account_url = wallet->account_url; external->login_url = wallet->login_url; - external->anon_address = wallet->anon_address; } std::move(callback).Run(static_cast(result), std::move(external)); diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_response.cc b/components/brave_rewards/browser/test/common/rewards_browsertest_response.cc index 03fe3a069b72..55b68892615f 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_response.cc +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_response.cc @@ -198,10 +198,6 @@ void RewardsBrowserTestResponse::LoadMocks() { path.AppendASCII("uphold_commit_resp.json"), &uphold_commit_resp_)); - ASSERT_TRUE(base::ReadFileToString( - path.AppendASCII("uphold_addresses_resp.json"), - &uphold_addresses_resp_)); - std::vector publisher_keys { "bumpsmack.com", "duckduckgo.com", @@ -340,11 +336,6 @@ void RewardsBrowserTestResponse::Get( "commit", base::CompareCase::INSENSITIVE_ASCII)) { *response = uphold_commit_resp_; - } else if (base::EndsWith( - url, - "addresses", - base::CompareCase::INSENSITIVE_ASCII)) { - *response = uphold_addresses_resp_; } else { *response = rewards_browsertest_util::GetUpholdCard( external_balance_, diff --git a/components/brave_rewards/browser/test/common/rewards_browsertest_response.h b/components/brave_rewards/browser/test/common/rewards_browsertest_response.h index ec468215b40d..3bdcb663ba0d 100644 --- a/components/brave_rewards/browser/test/common/rewards_browsertest_response.h +++ b/components/brave_rewards/browser/test/common/rewards_browsertest_response.h @@ -67,7 +67,6 @@ class RewardsBrowserTestResponse { std::string uphold_auth_resp_; std::string uphold_transactions_resp_; std::string uphold_commit_resp_; - std::string uphold_addresses_resp_; std::string user_funds_balance_resp_; std::vector requests_; diff --git a/test/data/rewards-data/uphold_addresses_resp.json b/test/data/rewards-data/uphold_addresses_resp.json deleted file mode 100644 index eb15cdd71b25..000000000000 --- a/test/data/rewards-data/uphold_addresses_resp.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "formats":[ - { - "format":"uuid", - "value":"1299eee5-03cd-4094-859a-cacb0f3a9321" - } - ], - "type":"anonymous" - } -] diff --git a/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom b/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom index c634b4ac83fa..6e877624fe4c 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom +++ b/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom @@ -145,7 +145,6 @@ struct ExternalWallet { string type; string token; string address; - string anon_address; WalletStatus status; string verify_url; string add_url; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration.cc index e5e3db54c268..e2e6ae706b73 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration.cc @@ -22,7 +22,7 @@ namespace braveledger_state { StateMigration::StateMigration(bat_ledger::LedgerImpl* ledger) : v1_(std::make_unique(ledger)), v2_(std::make_unique(ledger)), - v3_(std::make_unique(ledger)), + v3_(std::make_unique()), v4_(std::make_unique(ledger)), ledger_(ledger) { DCHECK(v1_ && v2_ && v3_ && v4_); diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.cc index dbc63a8109fe..9e21adb9a7a3 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.cc @@ -3,41 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - -#include "bat/ledger/global_constants.h" -#include "bat/ledger/internal/ledger_impl.h" -#include "bat/ledger/internal/state/state_keys.h" #include "bat/ledger/internal/state/state_migration_v3.h" -#include "bat/ledger/internal/state/state_util.h" -#include "bat/ledger/internal/uphold/uphold_util.h" namespace braveledger_state { -StateMigrationV3::StateMigrationV3(bat_ledger::LedgerImpl* ledger) : - ledger_(ledger) { -} +StateMigrationV3::StateMigrationV3() = default; StateMigrationV3::~StateMigrationV3() = default; void StateMigrationV3::Migrate(ledger::ResultCallback callback) { - const std::string anon_address = - ledger_->GetStringState(ledger::kStateUpholdAnonAddress); - - if (!anon_address.empty()) { - auto wallets = ledger_->GetExternalWallets(); - auto wallet = braveledger_uphold::GetWallet(std::move(wallets)); - if (!wallet) { - BLOG(0, "Wallet is null, but we can't recover"); - callback(ledger::Result::LEDGER_OK); - return; - } - - wallet->anon_address = anon_address; - ledger_->SaveExternalWallet(ledger::kWalletUphold, std::move(wallet)); - ledger_->ClearState(ledger::kStateUpholdAnonAddress); - } - + // In this migration we migrated anon address to uphold wallet in preferences + // because anon address was removed we can also remove this step + // Ref: https://github.com/brave/brave-browser/issues/11150 callback(ledger::Result::LEDGER_OK); } diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.h b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.h index 61dcb04c2e48..dffffc1f27f7 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration_v3.h @@ -6,26 +6,16 @@ #ifndef BRAVELEDGER_BAT_STATE_STATE_MIGRATION_V3_H_ #define BRAVELEDGER_BAT_STATE_STATE_MIGRATION_V3_H_ -#include -#include - #include "bat/ledger/ledger.h" -namespace bat_ledger { -class LedgerImpl; -} - namespace braveledger_state { class StateMigrationV3 { public: - explicit StateMigrationV3(bat_ledger::LedgerImpl* ledger); + StateMigrationV3(); ~StateMigrationV3(); void Migrate(ledger::ResultCallback callback); - - private: - bat_ledger::LedgerImpl* ledger_; // NOT OWNED }; } // namespace braveledger_state diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc index b36c69439422..efae62f37de5 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.cc @@ -227,10 +227,6 @@ void Uphold::GetUser(GetUserCallback callback) { user_->Get(callback); } -void Uphold::CreateAnonAddressIfNecessary(ledger::ResultCallback callback) { - card_->CreateAnonAddressIfNecessary(callback); -} - void Uphold::SaveTransferFee(ledger::TransferFeePtr transfer_fee) { if (!transfer_fee) { BLOG(0, "Transfer fee is null"); diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.h b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.h index ba73977975be..ed2a528c3aa1 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold.h @@ -69,8 +69,6 @@ class Uphold { void GetUser(GetUserCallback callback); - void CreateAnonAddressIfNecessary(ledger::ResultCallback callback); - void OnTimer(const uint32_t timer_id); private: diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.cc index b291f88ca8ca..36623b9a9ea9 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.cc @@ -242,165 +242,4 @@ void UpholdCard::OnUpdate( callback(ledger::Result::LEDGER_OK); } -void UpholdCard::GetCardAddresses( - GetCardAddressesCallback callback) { - auto wallets = ledger_->GetExternalWallets(); - auto wallet = GetWallet(std::move(wallets)); - if (!wallet) { - BLOG(0, "Wallet is null"); - callback(ledger::Result::LEDGER_ERROR, {}); - return; - } - - const auto headers = RequestAuthorization(wallet->token); - const std::string path = base::StringPrintf( - "/v0/me/cards/%s/addresses", - wallet->address.c_str()); - - auto address_callback = std::bind(&UpholdCard::OnGetCardAddresses, - this, - _1, - callback); - - const auto url = GetAPIUrl(path); - ledger_->LoadURL( - url, - headers, - "", - "application/json", - ledger::UrlMethod::GET, - address_callback); -} - -void UpholdCard::OnGetCardAddresses( - const ledger::UrlResponse& response, - GetCardAddressesCallback callback) { - BLOG(6, ledger::UrlResponseToString(__func__, response)); - - std::map addresses; - const ledger::Result result = - braveledger_response_util::ParseUpholdGetCardAddresses( - response, - &addresses); - - if (result == ledger::Result::EXPIRED_TOKEN) { - BLOG(0, "Expired token"); - callback(ledger::Result::EXPIRED_TOKEN, {}); - uphold_->DisconnectWallet(); - return; - } - - if (result != ledger::Result::LEDGER_OK) { - BLOG(0, "Couldn't get card addresses"); - callback(ledger::Result::LEDGER_ERROR, {}); - return; - } - - callback(ledger::Result::LEDGER_OK, addresses); -} - -void UpholdCard::CreateAnonAddressIfNecessary(ledger::ResultCallback callback) { - auto address_callback = std::bind(&UpholdCard::OnCreateAnonAddressIfNecessary, - this, - _1, - _2, - callback); - - GetCardAddresses(address_callback); -} - -void UpholdCard::OnCreateAnonAddressIfNecessary( - ledger::Result result, - std::map addresses, - ledger::ResultCallback callback) { - if (result == ledger::Result::LEDGER_OK && addresses.size() > 0) { - auto iter = addresses.find(kAnonID); - if (iter != addresses.end() && !iter->second.empty()) { - auto wallets = ledger_->GetExternalWallets(); - auto wallet = GetWallet(std::move(wallets)); - if (!wallet) { - BLOG(0, "Wallet is null"); - callback(ledger::Result::LEDGER_ERROR); - return; - } - - wallet->anon_address = iter->second; - ledger_->SaveExternalWallet(ledger::kWalletUphold, std::move(wallet)); - callback(ledger::Result::LEDGER_OK); - return; - } - } - - CreateAnonAddress(callback); -} - -void UpholdCard::CreateAnonAddress(ledger::ResultCallback callback) { - auto wallets = ledger_->GetExternalWallets(); - auto wallet = GetWallet(std::move(wallets)); - if (!wallet) { - BLOG(0, "Wallet is null"); - callback(ledger::Result::LEDGER_ERROR); - return; - } - - const auto headers = RequestAuthorization(wallet->token); - const std::string path = base::StringPrintf( - "/v0/me/cards/%s/addresses", - wallet->address.c_str()); - - const std::string payload = base::StringPrintf( - R"({ - "network": "%s" - })", - kAnonID); - - auto anon_callback = std::bind(&UpholdCard::OnCreateAnonAddress, - this, - _1, - callback); - - const auto url = GetAPIUrl(path); - ledger_->LoadURL( - url, - headers, - payload, - "application/json", - ledger::UrlMethod::POST, - anon_callback); -} - -void UpholdCard::OnCreateAnonAddress( - const ledger::UrlResponse& response, - ledger::ResultCallback callback) { - BLOG(6, ledger::UrlResponseToString(__func__, response)); - - std::string id; - const ledger::Result result = - braveledger_response_util::ParseUpholdCreateCard(response, &id); - if (result == ledger::Result::EXPIRED_TOKEN) { - BLOG(0, "Expired token"); - callback(ledger::Result::EXPIRED_TOKEN); - uphold_->DisconnectWallet(); - return; - } - - if (result != ledger::Result::LEDGER_OK || id.empty()) { - BLOG(0, "Couldn't create anon address"); - callback(ledger::Result::LEDGER_ERROR); - return; - } - - auto wallets = ledger_->GetExternalWallets(); - auto wallet = GetWallet(std::move(wallets)); - if (!wallet) { - BLOG(0, "Wallet is null"); - callback(ledger::Result::LEDGER_ERROR); - return; - } - - wallet->anon_address = id; - ledger_->SaveExternalWallet(ledger::kWalletUphold, std::move(wallet)); - callback(ledger::Result::LEDGER_OK); -} - } // namespace braveledger_uphold diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.h b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.h index 1b1d3b369c34..18ccf94296e3 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_card.h @@ -19,7 +19,6 @@ class LedgerImpl; namespace braveledger_uphold { const char kCardName[] = "Brave Browser"; -const char kAnonID[] = "anonymous"; struct UpdateCard { std::string label; @@ -43,8 +42,6 @@ class UpholdCard { void CreateIfNecessary(CreateCardCallback callback); - void CreateAnonAddressIfNecessary(ledger::ResultCallback callback); - private: void OnCreateIfNecessary( const ledger::UrlResponse& response, @@ -69,32 +66,9 @@ class UpholdCard { const ledger::UrlResponse& response, UpdateCardCallback callback); - void GetCardAddresses( - GetCardAddressesCallback callback); - std::map ParseGetCardAddressResponse( const std::string& response); - void OnGetCardAddresses( - const ledger::UrlResponse& response, - GetCardAddressesCallback callback); - - void OnCreateAnonAddressGet( - ledger::Result result, - std::map addresses); - - void OnCreateAnonAddressIfNecessary( - ledger::Result result, - std::map addresses, - ledger::ResultCallback callback); - - void CreateAnonAddress( - ledger::ResultCallback callback); - - void OnCreateAnonAddress( - const ledger::UrlResponse& response, - ledger::ResultCallback callback); - bat_ledger::LedgerImpl* ledger_; // NOT OWNED Uphold* uphold_; // NOT OWNED }; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.cc index 488bef1344e4..6dd731249361 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.cc @@ -31,7 +31,6 @@ namespace { std::string GeneratePayload( const double user_funds, const std::string& address, - const std::string& anon_address, const std::vector& seed) { base::Value denomination(base::Value::Type::DICTIONARY); denomination.SetStringKey("amount", base::NumberToString(user_funds)); @@ -71,7 +70,6 @@ std::string GeneratePayload( base::Value payload(base::Value::Type::DICTIONARY); payload.SetStringKey("signedLinkingRequest", signed_request_base64); - payload.SetStringKey("anonymousAddress", anon_address); std::string json; base::JSONWriter::Write(payload, &json); @@ -123,26 +121,10 @@ void WalletClaim::OnBalance( return; } - if (!wallet_ptr->anon_address.empty()) { - BLOG(1, "Anon address already exists"); - TransferFunds( - ledger::Result::LEDGER_OK, - balance->user_funds, - callback); - return; - } - - auto anon_callback = std::bind(&WalletClaim::TransferFunds, - this, - _1, - balance->user_funds, - callback); - - uphold_->CreateAnonAddressIfNecessary(anon_callback); + TransferFunds(balance->user_funds, callback); } void WalletClaim::TransferFunds( - const ledger::Result result, const double user_funds, ledger::ResultCallback callback) { auto wallets = ledger_->GetExternalWallets(); @@ -153,13 +135,6 @@ void WalletClaim::TransferFunds( return; } - if (result != ledger::Result::LEDGER_OK || - wallet_ptr->anon_address.empty()) { - BLOG(0, "Anon address is missing"); - callback(ledger::Result::LEDGER_ERROR); - return; - } - auto url_callback = std::bind(&WalletClaim::OnTransferFunds, this, _1, @@ -171,7 +146,6 @@ void WalletClaim::TransferFunds( const std::string payload = GeneratePayload( user_funds, wallet_ptr->address, - wallet_ptr->anon_address, braveledger_state::GetRecoverySeed(ledger_)); ledger_->LoadURL( diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.h b/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.h index e46686c2b7d9..a4cebe3b335a 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_claim.h @@ -32,7 +32,6 @@ class WalletClaim { ledger::ResultCallback callback); void TransferFunds( - const ledger::Result result, const double user_funds, ledger::ResultCallback callback); diff --git a/vendor/brave-ios/Ledger/Models/BATExternalWallet+DictionaryValue.mm b/vendor/brave-ios/Ledger/Models/BATExternalWallet+DictionaryValue.mm index 29b6ecd146cf..4484fc9b4b73 100644 --- a/vendor/brave-ios/Ledger/Models/BATExternalWallet+DictionaryValue.mm +++ b/vendor/brave-ios/Ledger/Models/BATExternalWallet+DictionaryValue.mm @@ -13,7 +13,6 @@ - (instancetype)initWithDictionaryValue:(NSDictionary *)dictionary if ((self = [self initWithExternalWallet:defaultWallet])) { self.token = dictionary[@"token"] ?: @""; self.address = dictionary[@"address"] ?: @""; - self.anonAddress = dictionary[@"anon_address"] ?: @""; self.status = static_cast([dictionary[@"status"] integerValue]); self.oneTimeString = dictionary[@"one_time_string"] ?: @""; self.userName = dictionary[@"user_name"] ?: @""; @@ -30,7 +29,6 @@ - (NSDictionary *)dictionaryValue return @{ @"token": self.token, @"address": self.address, - @"anon_address": self.anonAddress, @"status": @(self.status), @"one_time_string": self.oneTimeString, @"user_name": self.userName, @@ -43,8 +41,8 @@ - (NSDictionary *)dictionaryValue - (NSString *)description { - return [NSString stringWithFormat:@"%@: token: %@, address: %@, anonAddress: %@, status: %ld, ots: %@, username: %@, verifyUrl: %@, addUrl: %@, withdrawUrl: %@, accountUrl: %@", - [super description], self.token, self.address, self.anonAddress, self.status, self.oneTimeString, self.userName, self.verifyUrl, self.addUrl, self.withdrawUrl, self.accountUrl]; + return [NSString stringWithFormat:@"%@: token: %@, address: %@, status: %ld, ots: %@, username: %@, verifyUrl: %@, addUrl: %@, withdrawUrl: %@, accountUrl: %@", + [super description], self.token, self.address, self.status, self.oneTimeString, self.userName, self.verifyUrl, self.addUrl, self.withdrawUrl, self.accountUrl]; } @end