mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-08 11:59:23 +00:00
Merge branch 'main' into CW-867-investigate-issues-with-wownero-2
This commit is contained in:
commit
83e0729430
71 changed files with 502 additions and 395 deletions
|
@ -1,5 +1,7 @@
|
|||
-
|
||||
uri: ethereum.publicnode.com
|
||||
uri: ethereum-rpc.publicnode.com
|
||||
useSSL: true
|
||||
isDefault: true
|
||||
-
|
||||
uri: eth.llamarpc.com
|
||||
-
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
-
|
||||
uri: polygon-rpc.com
|
||||
-
|
||||
uri: polygon-bor.publicnode.com
|
||||
uri: polygon-bor-rpc.publicnode.com
|
||||
useSSL: true
|
||||
isDefault: true
|
||||
-
|
||||
uri: polygon.llamarpc.com
|
||||
-
|
||||
|
|
|
@ -1,3 +1,2 @@
|
|||
Support Monero Ledger
|
||||
Bug fixes
|
||||
New designs and better user experience
|
||||
UI enhancements
|
||||
Bug fixes
|
|
@ -1,5 +1,4 @@
|
|||
Support Monero Ledger
|
||||
Prepare for Haven removal
|
||||
Improve Ethereum and Polygon sending process
|
||||
Bug fixes
|
||||
New designs and better user experience
|
||||
Bitcoin and Litecoin enhancements
|
||||
Solana and Nano fixes/improvements
|
||||
UI enhancements
|
||||
Bug fixes
|
|
@ -4,7 +4,6 @@ import 'dart:io';
|
|||
import 'dart:isolate';
|
||||
|
||||
import 'package:bitcoin_base/bitcoin_base.dart';
|
||||
import 'package:cw_bitcoin/litecoin_wallet_addresses.dart';
|
||||
import 'package:cw_core/utils/print_verbose.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_wallet.dart';
|
||||
import 'package:cw_bitcoin/litecoin_wallet.dart';
|
||||
|
@ -991,6 +990,9 @@ abstract class ElectrumWalletBase
|
|||
@override
|
||||
Future<PendingTransaction> createTransaction(Object credentials) async {
|
||||
try {
|
||||
// start by updating unspent coins
|
||||
await updateAllUnspents();
|
||||
|
||||
final outputs = <BitcoinOutput>[];
|
||||
final transactionCredentials = credentials as BitcoinTransactionCredentials;
|
||||
final hasMultiDestination = transactionCredentials.outputs.length > 1;
|
||||
|
|
|
@ -349,8 +349,10 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
|
|||
type: addressPageType,
|
||||
network: network,
|
||||
);
|
||||
_addresses.add(address);
|
||||
Future.delayed(Duration.zero, () => updateAddressesByMatch());
|
||||
Future.delayed(Duration.zero, () {
|
||||
_addresses.add(address);
|
||||
updateAddressesByMatch();
|
||||
});
|
||||
return address;
|
||||
}
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import 'package:cw_core/monero_amount_format.dart';
|
|||
class MoneroBalance extends Balance {
|
||||
MoneroBalance({required this.fullBalance, required this.unlockedBalance, this.frozenBalance = 0})
|
||||
: formattedUnconfirmedBalance = moneroAmountToString(amount: fullBalance - unlockedBalance),
|
||||
formattedUnlockedBalance = moneroAmountToString(amount: unlockedBalance - frozenBalance),
|
||||
formattedUnlockedBalance = moneroAmountToString(amount: unlockedBalance),
|
||||
formattedFrozenBalance = moneroAmountToString(amount: frozenBalance),
|
||||
super(unlockedBalance, fullBalance);
|
||||
|
||||
|
|
|
@ -99,8 +99,8 @@ class Node extends HiveObject with Keyable {
|
|||
case WalletType.polygon:
|
||||
case WalletType.solana:
|
||||
case WalletType.tron:
|
||||
return Uri.parse(
|
||||
"http${isSSL ? "s" : ""}://$uriRaw${path!.startsWith("/") ? path : "/$path"}");
|
||||
return Uri.parse(
|
||||
"http${isSSL ? "s" : ""}://$uriRaw${path!.startsWith("/") ? path : "/$path"}");
|
||||
case WalletType.none:
|
||||
throw Exception('Unexpected type ${type.toString()} for Node uri');
|
||||
}
|
||||
|
@ -152,6 +152,7 @@ class Node extends HiveObject with Keyable {
|
|||
return requestMoneroNode();
|
||||
case WalletType.nano:
|
||||
case WalletType.banano:
|
||||
return requestNanoNode();
|
||||
case WalletType.bitcoin:
|
||||
case WalletType.litecoin:
|
||||
case WalletType.bitcoinCash:
|
||||
|
@ -198,14 +199,16 @@ class Node extends HiveObject with Keyable {
|
|||
);
|
||||
client.close();
|
||||
|
||||
if ((
|
||||
response.body.contains("400 Bad Request") // Some other generic error
|
||||
|| response.body.contains("plain HTTP request was sent to HTTPS port") // Cloudflare
|
||||
|| response.headers["location"] != null // Generic reverse proxy
|
||||
|| response.body.contains("301 Moved Permanently") // Poorly configured generic reverse proxy
|
||||
) && !(useSSL??false)
|
||||
) {
|
||||
|
||||
if ((response.body.contains("400 Bad Request") // Some other generic error
|
||||
||
|
||||
response.body.contains("plain HTTP request was sent to HTTPS port") // Cloudflare
|
||||
||
|
||||
response.headers["location"] != null // Generic reverse proxy
|
||||
||
|
||||
response.body
|
||||
.contains("301 Moved Permanently") // Poorly configured generic reverse proxy
|
||||
) &&
|
||||
!(useSSL ?? false)) {
|
||||
final oldUseSSL = useSSL;
|
||||
useSSL = true;
|
||||
try {
|
||||
|
@ -271,6 +274,35 @@ class Node extends HiveObject with Keyable {
|
|||
}
|
||||
}
|
||||
|
||||
Future<bool> requestNanoNode() async {
|
||||
try {
|
||||
final response = await http.post(
|
||||
uri,
|
||||
headers: {
|
||||
"Content-Type": "application/json",
|
||||
"nano-app": "cake-wallet"
|
||||
},
|
||||
body: jsonEncode(
|
||||
{
|
||||
"action": "account_balance",
|
||||
"account": "nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579",
|
||||
},
|
||||
),
|
||||
);
|
||||
final data = await jsonDecode(response.body);
|
||||
if (response.statusCode != 200 ||
|
||||
data["error"] != null ||
|
||||
data["balance"] == null ||
|
||||
data["receivable"] == null) {
|
||||
throw Exception(
|
||||
"Error while trying to get balance! ${data["error"] != null ? data["error"] : ""}");
|
||||
}
|
||||
return true;
|
||||
} catch (_) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> requestEthereumServer() async {
|
||||
try {
|
||||
final response = await http.get(
|
||||
|
|
|
@ -4,7 +4,7 @@ import 'package:cw_core/wownero_amount_format.dart';
|
|||
class WowneroBalance extends Balance {
|
||||
WowneroBalance({required this.fullBalance, required this.unlockedBalance, this.frozenBalance = 0})
|
||||
: formattedUnconfirmedBalance = wowneroAmountToString(amount: fullBalance - unlockedBalance),
|
||||
formattedUnlockedBalance = wowneroAmountToString(amount: unlockedBalance - frozenBalance),
|
||||
formattedUnlockedBalance = wowneroAmountToString(amount: unlockedBalance),
|
||||
formattedFrozenBalance =
|
||||
wowneroAmountToString(amount: frozenBalance),
|
||||
super(unlockedBalance, fullBalance);
|
||||
|
|
|
@ -29,7 +29,6 @@ import 'package:cw_evm/evm_chain_transaction_model.dart';
|
|||
import 'package:cw_evm/evm_chain_transaction_priority.dart';
|
||||
import 'package:cw_evm/evm_chain_wallet_addresses.dart';
|
||||
import 'package:cw_evm/evm_ledger_credentials.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:hex/hex.dart';
|
||||
import 'package:hive/hive.dart';
|
||||
import 'package:mobx/mobx.dart';
|
||||
|
@ -348,7 +347,7 @@ abstract class EVMChainWalletBase
|
|||
final CryptoCurrency transactionCurrency =
|
||||
balance.keys.firstWhere((element) => element.title == _credentials.currency.title);
|
||||
|
||||
final erc20Balance = balance[transactionCurrency]!;
|
||||
final currencyBalance = balance[transactionCurrency]!;
|
||||
BigInt totalAmount = BigInt.zero;
|
||||
BigInt estimatedFeesForTransaction = BigInt.zero;
|
||||
int exponent = transactionCurrency is Erc20Token ? transactionCurrency.decimal : 18;
|
||||
|
@ -385,7 +384,7 @@ abstract class EVMChainWalletBase
|
|||
estimatedGasUnitsForTransaction = gasFeesModel.estimatedGasUnits;
|
||||
maxFeePerGasForTransaction = gasFeesModel.maxFeePerGas;
|
||||
|
||||
if (erc20Balance.balance < totalAmount) {
|
||||
if (currencyBalance.balance < totalAmount) {
|
||||
throw EVMChainTransactionCreationException(transactionCurrency);
|
||||
}
|
||||
} else {
|
||||
|
@ -398,7 +397,7 @@ abstract class EVMChainWalletBase
|
|||
}
|
||||
|
||||
if (output.sendAll && transactionCurrency is Erc20Token) {
|
||||
totalAmount = erc20Balance.balance;
|
||||
totalAmount = currencyBalance.balance;
|
||||
}
|
||||
|
||||
final gasFeesModel = await calculateActualEstimatedFeeForCreateTransaction(
|
||||
|
@ -413,14 +412,15 @@ abstract class EVMChainWalletBase
|
|||
maxFeePerGasForTransaction = gasFeesModel.maxFeePerGas;
|
||||
|
||||
if (output.sendAll && transactionCurrency is! Erc20Token) {
|
||||
totalAmount = (erc20Balance.balance - estimatedFeesForTransaction);
|
||||
|
||||
if (estimatedFeesForTransaction > erc20Balance.balance) {
|
||||
throw EVMChainTransactionFeesException();
|
||||
}
|
||||
totalAmount = (currencyBalance.balance - estimatedFeesForTransaction);
|
||||
}
|
||||
|
||||
if (erc20Balance.balance < totalAmount) {
|
||||
// check the fees on the base currency (Eth/Polygon)
|
||||
if (estimatedFeesForTransaction > balance[currency]!.balance) {
|
||||
throw EVMChainTransactionFeesException();
|
||||
}
|
||||
|
||||
if (currencyBalance.balance < totalAmount) {
|
||||
throw EVMChainTransactionCreationException(transactionCurrency);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -126,8 +126,10 @@ Future<bool> setupNodeSync(
|
|||
|
||||
if (status != 0) {
|
||||
final error = monero.Wallet_errorString(wptr!);
|
||||
printV("error: $error");
|
||||
throw SetupWalletException(message: error);
|
||||
if (error != "no tx keys found for this txid") {
|
||||
printV("error: $error");
|
||||
throw SetupWalletException(message: error);
|
||||
}
|
||||
}
|
||||
|
||||
if (kDebugMode) {
|
||||
|
|
|
@ -7,7 +7,6 @@ import 'package:cw_core/pathForWallet.dart';
|
|||
import 'package:cw_core/transaction_priority.dart';
|
||||
import 'package:cw_core/account.dart';
|
||||
import 'package:cw_core/crypto_currency.dart';
|
||||
import 'package:cw_core/monero_amount_format.dart';
|
||||
import 'package:cw_core/monero_balance.dart';
|
||||
import 'package:cw_core/monero_transaction_priority.dart';
|
||||
import 'package:cw_core/monero_wallet_keys.dart';
|
||||
|
@ -28,7 +27,6 @@ import 'package:cw_monero/api/transaction_history.dart' as transaction_history;
|
|||
import 'package:cw_monero/api/wallet.dart' as monero_wallet;
|
||||
import 'package:cw_monero/api/wallet_manager.dart';
|
||||
import 'package:cw_monero/exceptions/monero_transaction_creation_exception.dart';
|
||||
import 'package:cw_monero/exceptions/monero_transaction_no_inputs_exception.dart';
|
||||
import 'package:cw_monero/ledger.dart';
|
||||
import 'package:cw_monero/monero_transaction_creation_credentials.dart';
|
||||
import 'package:cw_monero/monero_transaction_history.dart';
|
||||
|
@ -58,8 +56,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
required String password})
|
||||
: balance = ObservableMap<CryptoCurrency, MoneroBalance>.of({
|
||||
CryptoCurrency.xmr: MoneroBalance(
|
||||
fullBalance: monero_wallet.getFullBalance(accountIndex: 0),
|
||||
unlockedBalance: monero_wallet.getFullBalance(accountIndex: 0))
|
||||
fullBalance: monero_wallet.getFullBalance(accountIndex: 0),
|
||||
unlockedBalance: monero_wallet.getUnlockedBalance(accountIndex: 0),
|
||||
)
|
||||
}),
|
||||
_isTransactionUpdating = false,
|
||||
_hasSyncAfterStartup = false,
|
||||
|
@ -265,6 +264,14 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
return str;
|
||||
}
|
||||
|
||||
bool needExportOutputs(int amount) {
|
||||
// viewOnlyBalance - balance that we can spend
|
||||
// TODO(mrcyjanek): remove hasUnknownKeyImages when we cleanup coin control
|
||||
return (monero.Wallet_viewOnlyBalance(wptr!,
|
||||
accountIndex: walletAddresses.account!.id) < amount) ||
|
||||
monero.Wallet_hasUnknownKeyImages(wptr!);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<PendingTransaction> createTransaction(Object credentials) async {
|
||||
final _credentials = credentials as MoneroTransactionCreationCredentials;
|
||||
|
@ -273,7 +280,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
final hasMultiDestination = outputs.length > 1;
|
||||
final unlockedBalance = monero_wallet.getUnlockedBalance(
|
||||
accountIndex: walletAddresses.account!.id);
|
||||
var allInputsAmount = 0;
|
||||
|
||||
PendingTransactionDescription pendingTransactionDescription;
|
||||
|
||||
|
@ -287,11 +293,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
|
||||
for (final utx in unspentCoins) {
|
||||
if (utx.isSending) {
|
||||
allInputsAmount += utx.value;
|
||||
inputs.add(utx.keyImage!);
|
||||
}
|
||||
}
|
||||
final spendAllCoins = inputs.length == unspentCoins.length;
|
||||
|
||||
if (hasMultiDestination) {
|
||||
if (outputs.any(
|
||||
|
@ -303,8 +307,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
final int totalAmount = outputs.fold(
|
||||
0, (acc, value) => acc + (value.formattedCryptoAmount ?? 0));
|
||||
|
||||
final estimatedFee =
|
||||
calculateEstimatedFee(_credentials.priority, totalAmount);
|
||||
if (unlockedBalance < totalAmount) {
|
||||
throw MoneroTransactionCreationException(
|
||||
'You do not have enough XMR to send this amount.');
|
||||
|
@ -334,8 +336,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
output.isParsedAddress ? output.extractedAddress : output.address;
|
||||
final amount =
|
||||
output.sendAll ? null : output.cryptoAmount!.replaceAll(',', '.');
|
||||
final formattedAmount =
|
||||
output.sendAll ? null : output.formattedCryptoAmount;
|
||||
|
||||
// if ((formattedAmount != null && unlockedBalance < formattedAmount) ||
|
||||
// (formattedAmount == null && unlockedBalance <= 0)) {
|
||||
|
@ -345,8 +345,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
// 'You do not have enough unlocked balance. Unlocked: $formattedBalance. Transaction amount: ${output.cryptoAmount}.');
|
||||
// }
|
||||
|
||||
final estimatedFee =
|
||||
calculateEstimatedFee(_credentials.priority, formattedAmount);
|
||||
if (inputs.isEmpty) MoneroTransactionCreationException(
|
||||
'No inputs selected');
|
||||
pendingTransactionDescription =
|
||||
|
@ -742,26 +740,16 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
Future<void> _askForUpdateTransactionHistory() async =>
|
||||
await updateTransactions();
|
||||
|
||||
int _getFullBalance() =>
|
||||
monero_wallet.getFullBalance(accountIndex: walletAddresses.account!.id);
|
||||
|
||||
int _getUnlockedBalance() => monero_wallet.getUnlockedBalance(
|
||||
accountIndex: walletAddresses.account!.id);
|
||||
|
||||
int _getFrozenBalance() {
|
||||
var frozenBalance = 0;
|
||||
|
||||
unspentCoinsInfo.values.forEach((info) {
|
||||
unspentCoins.forEach((element) {
|
||||
if (element.hash == info.hash &&
|
||||
element.vout == info.vout &&
|
||||
info.isFrozen &&
|
||||
element.value == info.value && info.walletId == id &&
|
||||
info.accountIndex == walletAddresses.account!.id) {
|
||||
if (element.isFrozen && !element.isSending) frozenBalance+= element.value;
|
||||
}
|
||||
});
|
||||
});
|
||||
for (var coin in unspentCoinsInfo.values.where((element) =>
|
||||
element.walletId == id && element.accountIndex == walletAddresses.account!.id)) {
|
||||
if (coin.isFrozen && !coin.isSending) frozenBalance += coin.value;
|
||||
}
|
||||
|
||||
return frozenBalance;
|
||||
}
|
||||
|
|
|
@ -54,12 +54,12 @@ class NanoClient {
|
|||
}
|
||||
}
|
||||
|
||||
Map<String, String> getHeaders() {
|
||||
Map<String, String> getHeaders(String host) {
|
||||
final headers = Map<String, String>.from(CAKE_HEADERS);
|
||||
if (_node!.uri.host == "rpc.nano.to") {
|
||||
if (host == "rpc.nano.to") {
|
||||
headers["key"] = nano_secrets.nano2ApiKey;
|
||||
}
|
||||
if (_node!.uri.host == "nano.nownodes.io") {
|
||||
if (host == "nano.nownodes.io") {
|
||||
headers["api-key"] = nano_secrets.nanoNowNodesApiKey;
|
||||
}
|
||||
return headers;
|
||||
|
@ -68,7 +68,7 @@ class NanoClient {
|
|||
Future<NanoBalance> getBalance(String address) async {
|
||||
final response = await http.post(
|
||||
_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: jsonEncode(
|
||||
{
|
||||
"action": "account_balance",
|
||||
|
@ -95,7 +95,7 @@ class NanoClient {
|
|||
try {
|
||||
final response = await http.post(
|
||||
_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: jsonEncode(
|
||||
{
|
||||
"action": "account_info",
|
||||
|
@ -116,7 +116,7 @@ class NanoClient {
|
|||
try {
|
||||
final response = await http.post(
|
||||
_node!.uri,
|
||||
headers: CAKE_HEADERS,
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: jsonEncode(
|
||||
{
|
||||
"action": "block_info",
|
||||
|
@ -183,7 +183,7 @@ class NanoClient {
|
|||
Future<String> requestWork(String hash) async {
|
||||
final response = await http.post(
|
||||
_powNode!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_powNode!.uri.host),
|
||||
body: json.encode(
|
||||
{
|
||||
"action": "work_generate",
|
||||
|
@ -226,7 +226,7 @@ class NanoClient {
|
|||
|
||||
final processResponse = await http.post(
|
||||
_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: processBody,
|
||||
);
|
||||
|
||||
|
@ -425,7 +425,7 @@ class NanoClient {
|
|||
});
|
||||
final processResponse = await http.post(
|
||||
_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: processBody,
|
||||
);
|
||||
|
||||
|
@ -441,7 +441,7 @@ class NanoClient {
|
|||
required String privateKey,
|
||||
}) async {
|
||||
final receivableResponse = await http.post(_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: jsonEncode({
|
||||
"action": "receivable",
|
||||
"account": destinationAddress,
|
||||
|
@ -493,7 +493,7 @@ class NanoClient {
|
|||
Future<List<NanoTransactionModel>> fetchTransactions(String address) async {
|
||||
try {
|
||||
final response = await http.post(_node!.uri,
|
||||
headers: getHeaders(),
|
||||
headers: getHeaders(_node!.uri.host),
|
||||
body: jsonEncode({
|
||||
"action": "account_history",
|
||||
"account": address,
|
||||
|
@ -509,15 +509,16 @@ class NanoClient {
|
|||
.map<NanoTransactionModel>((transaction) => NanoTransactionModel.fromJson(transaction))
|
||||
.toList();
|
||||
} catch (e) {
|
||||
printV(e);
|
||||
return [];
|
||||
printV("error fetching transactions: $e");
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<N2Node>> getN2Reps() async {
|
||||
final uri = Uri.parse(N2_REPS_ENDPOINT);
|
||||
final response = await http.post(
|
||||
Uri.parse(N2_REPS_ENDPOINT),
|
||||
headers: CAKE_HEADERS,
|
||||
uri,
|
||||
headers: getHeaders(uri.host),
|
||||
body: jsonEncode({"action": "reps"}),
|
||||
);
|
||||
try {
|
||||
|
@ -531,9 +532,10 @@ class NanoClient {
|
|||
}
|
||||
|
||||
Future<int> getRepScore(String rep) async {
|
||||
final uri = Uri.parse(N2_REPS_ENDPOINT);
|
||||
final response = await http.post(
|
||||
Uri.parse(N2_REPS_ENDPOINT),
|
||||
headers: CAKE_HEADERS,
|
||||
uri,
|
||||
headers: getHeaders(uri.host),
|
||||
body: jsonEncode({
|
||||
"action": "rep_info",
|
||||
"account": rep,
|
||||
|
|
|
@ -379,16 +379,18 @@ class SolanaWalletClient {
|
|||
required double solBalance,
|
||||
required double fee,
|
||||
}) async {
|
||||
final rent =
|
||||
await _client!.getMinimumBalanceForMintRentExemption(commitment: Commitment.confirmed);
|
||||
|
||||
final rentInSol = (rent / lamportsPerSol).toDouble();
|
||||
|
||||
final remnant = solBalance - (inputAmount + fee);
|
||||
|
||||
if (remnant > rentInSol) return true;
|
||||
|
||||
return false;
|
||||
return true;
|
||||
// TODO: this is not doing what the name inclines
|
||||
// final rent =
|
||||
// await _client!.getMinimumBalanceForMintRentExemption(commitment: Commitment.confirmed);
|
||||
//
|
||||
// final rentInSol = (rent / lamportsPerSol).toDouble();
|
||||
//
|
||||
// final remnant = solBalance - (inputAmount + fee);
|
||||
//
|
||||
// if (remnant > rentInSol) return true;
|
||||
//
|
||||
// return false;
|
||||
}
|
||||
|
||||
Future<PendingSolanaTransaction> _signNativeTokenTransaction({
|
||||
|
@ -479,6 +481,9 @@ class SolanaWalletClient {
|
|||
final destinationOwner = Ed25519HDPublicKey.fromBase58(destinationAddress);
|
||||
final mint = Ed25519HDPublicKey.fromBase58(tokenMint);
|
||||
|
||||
// Input by the user
|
||||
final amount = (inputAmount * math.pow(10, tokenDecimals)).toInt();
|
||||
|
||||
ProgramAccount? associatedRecipientAccount;
|
||||
ProgramAccount? associatedSenderAccount;
|
||||
|
||||
|
@ -501,18 +506,48 @@ class SolanaWalletClient {
|
|||
}
|
||||
|
||||
try {
|
||||
associatedRecipientAccount ??= await _client!.createAssociatedTokenAccount(
|
||||
mint: mint,
|
||||
owner: destinationOwner,
|
||||
funder: ownerKeypair,
|
||||
);
|
||||
if (associatedRecipientAccount == null) {
|
||||
final derivedAddress = await findAssociatedTokenAddress(
|
||||
owner: destinationOwner,
|
||||
mint: mint,
|
||||
);
|
||||
|
||||
final instruction = AssociatedTokenAccountInstruction.createAccount(
|
||||
mint: mint,
|
||||
address: derivedAddress,
|
||||
owner: destinationOwner,
|
||||
funder: ownerKeypair.publicKey,
|
||||
);
|
||||
|
||||
final _signedTx = await _signTransactionInternal(
|
||||
message: Message.only(instruction),
|
||||
signers: [ownerKeypair],
|
||||
commitment: commitment,
|
||||
latestBlockhash: await _getLatestBlockhash(commitment),
|
||||
);
|
||||
|
||||
await sendTransaction(
|
||||
signedTransaction: _signedTx,
|
||||
commitment: commitment,
|
||||
);
|
||||
|
||||
associatedRecipientAccount = ProgramAccount(
|
||||
pubkey: derivedAddress.toBase58(),
|
||||
account: Account(
|
||||
owner: destinationOwner.toBase58(),
|
||||
lamports: 0,
|
||||
executable: false,
|
||||
rentEpoch: BigInt.zero,
|
||||
data: null,
|
||||
),
|
||||
);
|
||||
|
||||
await Future.delayed(Duration(seconds: 5));
|
||||
}
|
||||
} catch (e) {
|
||||
throw SolanaCreateAssociatedTokenAccountException(e.toString());
|
||||
}
|
||||
|
||||
// Input by the user
|
||||
final amount = (inputAmount * math.pow(10, tokenDecimals)).toInt();
|
||||
|
||||
final instruction = TokenInstruction.transfer(
|
||||
source: Ed25519HDPublicKey.fromBase58(associatedSenderAccount.pubkey),
|
||||
destination: Ed25519HDPublicKey.fromBase58(associatedRecipientAccount.pubkey),
|
||||
|
@ -550,10 +585,14 @@ class SolanaWalletClient {
|
|||
latestBlockhash: latestBlockhash,
|
||||
);
|
||||
|
||||
sendTx() async => await sendTransaction(
|
||||
sendTx() async {
|
||||
await Future.delayed(Duration(seconds: 3));
|
||||
|
||||
return await sendTransaction(
|
||||
signedTransaction: signedTx,
|
||||
commitment: commitment,
|
||||
);
|
||||
}
|
||||
|
||||
final pendingTransaction = PendingSolanaTransaction(
|
||||
amount: inputAmount,
|
||||
|
|
|
@ -33,7 +33,6 @@ import 'package:shared_preferences/shared_preferences.dart';
|
|||
import 'package:solana/base58.dart';
|
||||
import 'package:solana/metaplex.dart' as metaplex;
|
||||
import 'package:solana/solana.dart';
|
||||
import 'package:solana/src/crypto/ed25519_hd_keypair.dart';
|
||||
|
||||
part 'solana_wallet.g.dart';
|
||||
|
||||
|
|
|
@ -272,7 +272,7 @@ SPEC CHECKSUMS:
|
|||
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
|
||||
universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
|
||||
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
|
||||
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
|
||||
wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
|
||||
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
|
||||
|
||||
PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597
|
||||
|
|
|
@ -149,7 +149,8 @@ class CWBitcoin extends Bitcoin {
|
|||
}
|
||||
|
||||
@override
|
||||
Future<int> estimateFakeSendAllTxAmount(Object wallet, TransactionPriority priority) async {
|
||||
Future<int> estimateFakeSendAllTxAmount(Object wallet, TransactionPriority priority,
|
||||
{UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any}) async {
|
||||
try {
|
||||
final sk = ECPrivate.random();
|
||||
final electrumWallet = wallet as ElectrumWallet;
|
||||
|
@ -173,6 +174,7 @@ class CWBitcoin extends Bitcoin {
|
|||
? priority as LitecoinTransactionPriority
|
||||
: priority as BitcoinTransactionPriority,
|
||||
),
|
||||
coinTypeToSpendFrom: coinTypeToSpendFrom,
|
||||
);
|
||||
|
||||
return estimatedTx.amount;
|
||||
|
|
|
@ -51,6 +51,8 @@ class RobinhoodBuyProvider extends BuyProvider {
|
|||
switch (wallet.type) {
|
||||
case WalletType.ethereum:
|
||||
case WalletType.polygon:
|
||||
case WalletType.solana:
|
||||
case WalletType.tron:
|
||||
return await wallet.signMessage(message);
|
||||
case WalletType.litecoin:
|
||||
case WalletType.bitcoin:
|
||||
|
@ -78,8 +80,7 @@ class RobinhoodBuyProvider extends BuyProvider {
|
|||
if (response.statusCode == 200) {
|
||||
return (jsonDecode(response.body) as Map<String, dynamic>)['connectId'] as String;
|
||||
} else {
|
||||
throw Exception(
|
||||
'Provider currently unavailable. Status: ${response.statusCode} ${response.body}');
|
||||
throw Exception('Provider currently unavailable. Status: ${response.statusCode}');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -120,13 +121,13 @@ class RobinhoodBuyProvider extends BuyProvider {
|
|||
try {
|
||||
final uri = await requestProviderUrl();
|
||||
await launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||
} catch (_) {
|
||||
} catch (e) {
|
||||
await showPopUp<void>(
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return AlertWithOneAction(
|
||||
alertTitle: "Robinhood Connect",
|
||||
alertContent: S.of(context).buy_provider_unavailable,
|
||||
alertContent: e.toString(),
|
||||
buttonText: S.of(context).ok,
|
||||
buttonAction: () => Navigator.of(context).pop());
|
||||
});
|
||||
|
|
|
@ -230,6 +230,7 @@ class CakePayApi {
|
|||
|
||||
var headers = {
|
||||
'accept': 'application/json; charset=UTF-8',
|
||||
'Content-Type': 'application/json; charset=UTF-8',
|
||||
'Authorization': 'Api-Key $apiKey',
|
||||
};
|
||||
|
||||
|
@ -240,7 +241,7 @@ class CakePayApi {
|
|||
'Failed to fetch vendors: statusCode - ${response.statusCode}, queryParams -$queryParams, response - ${response.body}');
|
||||
}
|
||||
|
||||
final bodyJson = json.decode(response.body);
|
||||
final bodyJson = json.decode(utf8.decode(response.bodyBytes));
|
||||
|
||||
if (bodyJson is List<dynamic> && bodyJson.isEmpty) {
|
||||
return [];
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
import 'dart:convert';
|
||||
|
||||
import 'package:cake_wallet/entities/fiat_currency.dart';
|
||||
|
||||
class CakePayCard {
|
||||
|
@ -38,17 +36,11 @@ class CakePayCard {
|
|||
});
|
||||
|
||||
factory CakePayCard.fromJson(Map<String, dynamic> json) {
|
||||
|
||||
final name = stripHtmlIfNeeded(json['name'] as String? ?? '');
|
||||
final decodedName = fixEncoding(name);
|
||||
|
||||
final description = stripHtmlIfNeeded(json['description'] as String? ?? '');
|
||||
final decodedDescription = fixEncoding(description);
|
||||
|
||||
final termsAndConditions = stripHtmlIfNeeded(json['terms_and_conditions'] as String? ?? '');
|
||||
final decodedTermsAndConditions = fixEncoding(termsAndConditions);
|
||||
|
||||
final howToUse = stripHtmlIfNeeded(json['how_to_use'] as String? ?? '');
|
||||
final decodedHowToUse = fixEncoding(howToUse);
|
||||
|
||||
final fiatCurrency = FiatCurrency.deserialize(raw: json['currency_code'] as String? ?? '');
|
||||
|
||||
|
@ -59,10 +51,10 @@ class CakePayCard {
|
|||
|
||||
return CakePayCard(
|
||||
id: json['id'] as int? ?? 0,
|
||||
name: decodedName,
|
||||
description: decodedDescription,
|
||||
termsAndConditions: decodedTermsAndConditions,
|
||||
howToUse: decodedHowToUse,
|
||||
name: name,
|
||||
description: description,
|
||||
termsAndConditions: termsAndConditions,
|
||||
howToUse: howToUse,
|
||||
expiryAndValidity: json['expiry_and_validity'] as String?,
|
||||
cardImageUrl: json['card_image_url'] as String?,
|
||||
country: json['country'] as String?,
|
||||
|
@ -79,13 +71,4 @@ class CakePayCard {
|
|||
static String stripHtmlIfNeeded(String text) {
|
||||
return text.replaceAll(RegExp(r'<[^>]*>|&[^;]+;'), ' ');
|
||||
}
|
||||
|
||||
static String fixEncoding(String text) {
|
||||
try {
|
||||
final bytes = latin1.encode(text);
|
||||
return utf8.decode(bytes, allowMalformed: true);
|
||||
} catch (_) {
|
||||
return text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
import 'dart:convert';
|
||||
|
||||
import 'cake_pay_card.dart';
|
||||
|
||||
class CakePayVendor {
|
||||
|
@ -21,7 +19,6 @@ class CakePayVendor {
|
|||
|
||||
factory CakePayVendor.fromJson(Map<String, dynamic> json, String country) {
|
||||
final name = stripHtmlIfNeeded(json['name'] as String);
|
||||
final decodedName = fixEncoding(name);
|
||||
|
||||
var cardsJson = json['cards'] as List?;
|
||||
CakePayCard? cardForVendor;
|
||||
|
@ -36,7 +33,7 @@ class CakePayVendor {
|
|||
|
||||
return CakePayVendor(
|
||||
id: json['id'] as int,
|
||||
name: decodedName,
|
||||
name: name,
|
||||
unavailable: json['unavailable'] as bool? ?? false,
|
||||
cakeWarnings: json['cake_warnings'] as String?,
|
||||
country: country,
|
||||
|
@ -47,9 +44,4 @@ class CakePayVendor {
|
|||
static String stripHtmlIfNeeded(String text) {
|
||||
return text.replaceAll(RegExp(r'<[^>]*>|&[^;]+;'), ' ');
|
||||
}
|
||||
|
||||
static String fixEncoding(String text) {
|
||||
final bytes = latin1.encode(text);
|
||||
return utf8.decode(bytes, allowMalformed: true);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,8 +35,8 @@ const publicBitcoinTestnetElectrumUri =
|
|||
'$publicBitcoinTestnetElectrumAddress:$publicBitcoinTestnetElectrumPort';
|
||||
const cakeWalletLitecoinElectrumUri = 'ltc-electrum.cakewallet.com:50002';
|
||||
const havenDefaultNodeUri = 'nodes.havenprotocol.org:443';
|
||||
const ethereumDefaultNodeUri = 'ethereum.publicnode.com';
|
||||
const polygonDefaultNodeUri = 'polygon-bor.publicnode.com';
|
||||
const ethereumDefaultNodeUri = 'ethereum-rpc.publicnode.com';
|
||||
const polygonDefaultNodeUri = 'polygon-bor-rpc.publicnode.com';
|
||||
const cakeWalletBitcoinCashDefaultNodeUri = 'bitcoincash.stackwallet.com:50002';
|
||||
const nanoDefaultNodeUri = 'nano.nownodes.io';
|
||||
const nanoDefaultPowNodeUri = 'rpc.nano.to';
|
||||
|
@ -360,6 +360,18 @@ Future<void> defaultSettingsMigration(
|
|||
'solana-rpc.publicnode.com:443',
|
||||
],
|
||||
);
|
||||
_updateNode(
|
||||
nodes: nodes,
|
||||
currentUri: "ethereum.publicnode.com",
|
||||
newUri: "ethereum-rpc.publicnode.com",
|
||||
useSSL: true,
|
||||
);
|
||||
_updateNode(
|
||||
nodes: nodes,
|
||||
currentUri: "polygon-bor.publicnode.com",
|
||||
newUri: "polygon-bor-rpc.publicnode.com",
|
||||
useSSL: true,
|
||||
);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -375,6 +387,24 @@ Future<void> defaultSettingsMigration(
|
|||
await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
|
||||
}
|
||||
|
||||
void _updateNode({
|
||||
required Box<Node> nodes,
|
||||
required String currentUri,
|
||||
String? newUri,
|
||||
bool? useSSL,
|
||||
}) {
|
||||
for (Node node in nodes.values) {
|
||||
if (node.uriRaw == currentUri) {
|
||||
if (newUri != null) {
|
||||
node.uriRaw = newUri;
|
||||
}
|
||||
if (useSSL != null) {
|
||||
node.useSSL = useSSL;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _backupHavenSeeds(Box<HavenSeedStore> havenSeedStore) async {
|
||||
final future = haven?.backupHavenSeeds(havenSeedStore);
|
||||
if (future != null) {
|
||||
|
@ -475,7 +505,7 @@ Future<void> updateNanoNodeList({required Box<Node> nodes}) async {
|
|||
];
|
||||
// add new nodes:
|
||||
for (final node in nodeList) {
|
||||
if (listOfNewEndpoints.contains(node.uriRaw)) {
|
||||
if (listOfNewEndpoints.contains(node.uriRaw) && !nodes.values.contains(node)) {
|
||||
await nodes.add(node);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -244,7 +244,9 @@ class AddressResolver {
|
|||
if (unstoppableDomains.any((domain) => name.trim() == domain)) {
|
||||
if (settingsStore.lookupsUnstoppableDomains) {
|
||||
final address = await fetchUnstoppableDomainAddress(text, ticker);
|
||||
return ParsedAddress.fetchUnstoppableDomainAddress(address: address, name: text);
|
||||
if (address.isNotEmpty) {
|
||||
return ParsedAddress.fetchUnstoppableDomainAddress(address: address, name: text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -260,6 +262,7 @@ class AddressResolver {
|
|||
if (formattedName.contains(".")) {
|
||||
if (settingsStore.lookupsOpenAlias) {
|
||||
final txtRecord = await OpenaliasRecord.lookupOpenAliasRecord(formattedName);
|
||||
|
||||
if (txtRecord != null) {
|
||||
final record = await OpenaliasRecord.fetchAddressAndName(
|
||||
formattedName: formattedName, ticker: ticker.toLowerCase(), txtRecord: txtRecord);
|
||||
|
|
|
@ -391,6 +391,12 @@ class CWMonero extends Monero {
|
|||
return moneroWallet.exportOutputsUR(all);
|
||||
}
|
||||
|
||||
@override
|
||||
bool needExportOutputs(Object wallet, int amount) {
|
||||
final moneroWallet = wallet as MoneroWallet;
|
||||
return moneroWallet.needExportOutputs(amount);
|
||||
}
|
||||
|
||||
@override
|
||||
void monerocCheck() {
|
||||
checkIfMoneroCIsFine();
|
||||
|
|
|
@ -312,6 +312,10 @@ class BuySellPage extends BasePage {
|
|||
|
||||
reaction((_) => buySellViewModel.isReadyToTrade, (bool isReady) {
|
||||
if (isReady) {
|
||||
if (buySellViewModel.skipIsReadyToTradeReaction) {
|
||||
buySellViewModel.skipIsReadyToTradeReaction = false;
|
||||
return;
|
||||
}
|
||||
if (cryptoAmountController.text.isNotEmpty &&
|
||||
cryptoAmountController.text != S.current.fetching) {
|
||||
buySellViewModel.changeCryptoAmount(amount: cryptoAmountController.text);
|
||||
|
|
|
@ -14,6 +14,7 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
|||
import 'package:cw_core/crypto_currency.dart';
|
||||
import 'package:cw_core/unspent_coin_type.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:fluttertoast/fluttertoast.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
class BalanceRowWidget extends StatelessWidget {
|
||||
|
@ -76,14 +77,21 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
|
||||
),
|
||||
child: Container(
|
||||
margin: const EdgeInsets.only(top: 16, left: 24, right: 8, bottom: 16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
|
||||
child: Row(
|
||||
child: TextButton(
|
||||
onPressed: () => Fluttertoast.showToast(
|
||||
msg: S.current.show_balance_toast,
|
||||
backgroundColor: Color.fromRGBO(0, 0, 0, 0.85),
|
||||
),
|
||||
onLongPress: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
|
||||
style: TextButton.styleFrom(
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30)),
|
||||
),
|
||||
child: Container(
|
||||
margin: const EdgeInsets.only(top: 10, left: 12, right: 12, bottom: 10),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
|
@ -159,7 +167,7 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
],
|
||||
),
|
||||
SizedBox(
|
||||
width: min(MediaQuery.of(context).size.width * 0.2, 100),
|
||||
//width: min(MediaQuery.of(context).size.width * 0.2, 100),
|
||||
child: Center(
|
||||
child: Column(
|
||||
children: [
|
||||
|
@ -201,22 +209,16 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (frozenBalance.isNotEmpty)
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: hasAdditionalBalance
|
||||
? () => _showBalanceDescription(
|
||||
context, S.of(context).unavailable_balance_description)
|
||||
: null,
|
||||
child: Column(
|
||||
//),
|
||||
if (frozenBalance.isNotEmpty)
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 26),
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
S.of(context).unavailable_balance,
|
||||
S.of(context).frozen_balance,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
|
@ -227,14 +229,6 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
height: 1,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||
child: Icon(Icons.help_outline,
|
||||
size: 16,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.labelTextColor),
|
||||
),
|
||||
],
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
|
@ -266,11 +260,8 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (hasAdditionalBalance)
|
||||
GestureDetector(
|
||||
onTap: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
|
||||
child: Column(
|
||||
if (hasAdditionalBalance)
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 24),
|
||||
|
@ -313,8 +304,8 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -330,12 +321,20 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
|
||||
),
|
||||
child: Container(
|
||||
child: TextButton(
|
||||
onPressed: () => Fluttertoast.showToast(
|
||||
msg: S.current.show_balance_toast,
|
||||
backgroundColor: Color.fromRGBO(0, 0, 0, 0.85),
|
||||
),
|
||||
onLongPress: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
|
||||
style: TextButton.styleFrom(
|
||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30)),
|
||||
),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
margin: const EdgeInsets.only(top: 16, left: 24, right: 8, bottom: 16),
|
||||
margin: const EdgeInsets.only(top: 10, left: 12, right: 12, bottom: 10),
|
||||
child: Stack(
|
||||
children: [
|
||||
if (currency == CryptoCurrency.ltc)
|
||||
|
@ -343,7 +342,6 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
Container(
|
||||
padding: EdgeInsets.only(right: 16, top: 0),
|
||||
child: Column(
|
||||
children: [
|
||||
Container(
|
||||
|
@ -374,80 +372,77 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
],
|
||||
),
|
||||
if (hasSecondAvailableBalance)
|
||||
GestureDetector(
|
||||
onTap: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
|
||||
child: Row(
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () => launchUrl(
|
||||
Uri.parse(
|
||||
"https://docs.cakewallet.com/cryptos/litecoin.html#mweb"),
|
||||
mode: LaunchMode.externalApplication,
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'${secondAvailableBalanceLabel}',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontFamily: 'Lato',
|
||||
fontWeight: FontWeight.w400,
|
||||
Row(
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () => launchUrl(
|
||||
Uri.parse(
|
||||
"https://docs.cakewallet.com/cryptos/litecoin#mweb"),
|
||||
mode: LaunchMode.externalApplication,
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
'${secondAvailableBalanceLabel}',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
fontFamily: 'Lato',
|
||||
fontWeight: FontWeight.w400,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.labelTextColor,
|
||||
height: 1,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||
child: Icon(Icons.help_outline,
|
||||
size: 16,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.labelTextColor,
|
||||
height: 1,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||
child: Icon(Icons.help_outline,
|
||||
size: 16,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.labelTextColor),
|
||||
)
|
||||
],
|
||||
),
|
||||
.labelTextColor),
|
||||
)
|
||||
],
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
AutoSizeText(
|
||||
secondAvailableBalance,
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
AutoSizeText(
|
||||
secondAvailableBalance,
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
fontFamily: 'Lato',
|
||||
fontWeight: FontWeight.w900,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.assetTitleColor,
|
||||
height: 1,
|
||||
),
|
||||
maxLines: 1,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 6),
|
||||
if (!isTestnet)
|
||||
Text(
|
||||
'${secondAvailableFiatBalance}',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 24,
|
||||
fontSize: 16,
|
||||
fontFamily: 'Lato',
|
||||
fontWeight: FontWeight.w900,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.assetTitleColor,
|
||||
.textColor,
|
||||
height: 1,
|
||||
),
|
||||
maxLines: 1,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
SizedBox(height: 6),
|
||||
if (!isTestnet)
|
||||
Text(
|
||||
'${secondAvailableFiatBalance}',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontFamily: 'Lato',
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context)
|
||||
.extension<BalancePageTheme>()!
|
||||
.textColor,
|
||||
height: 1,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
@ -515,7 +510,7 @@ class BalanceRowWidget extends StatelessWidget {
|
|||
),
|
||||
IntrinsicHeight(
|
||||
child: Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
padding: EdgeInsets.symmetric(horizontal: 12),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
|
|
|
@ -20,7 +20,8 @@ class SeedVerificationPage extends BasePage {
|
|||
builder: (context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: walletSeedViewModel.isVerificationComplete
|
||||
child: walletSeedViewModel.isVerificationComplete ||
|
||||
walletSeedViewModel.verificationIndices.isEmpty
|
||||
? SeedVerificationSuccessView(
|
||||
imageColor: titleColor(context),
|
||||
)
|
||||
|
|
|
@ -4,6 +4,7 @@ import 'package:cake_wallet/entities/contact_record.dart';
|
|||
import 'package:cake_wallet/core/execution_state.dart';
|
||||
import 'package:cake_wallet/entities/fiat_currency.dart';
|
||||
import 'package:cake_wallet/entities/template.dart';
|
||||
import 'package:cake_wallet/monero/monero.dart';
|
||||
import 'package:cake_wallet/reactions/wallet_connect.dart';
|
||||
import 'package:cake_wallet/generated/i18n.dart';
|
||||
import 'package:cake_wallet/routes.dart';
|
||||
|
@ -412,6 +413,20 @@ class SendPage extends BasePage {
|
|||
}
|
||||
}
|
||||
|
||||
if (sendViewModel.wallet.type == WalletType.monero) {
|
||||
int amount = 0;
|
||||
for (var item in sendViewModel.outputs) {
|
||||
amount += item.formattedCryptoAmount;
|
||||
}
|
||||
if (monero!.needExportOutputs(sendViewModel.wallet, amount)) {
|
||||
await Navigator.of(context).pushNamed(Routes.urqrAnimatedPage, arguments: 'export-outputs');
|
||||
await Future.delayed(Duration(seconds: 1)); // wait for monero to refresh the state
|
||||
}
|
||||
if (monero!.needExportOutputs(sendViewModel.wallet, amount)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
final check = sendViewModel.shouldDisplayTotp();
|
||||
authService.authenticateAction(
|
||||
context,
|
||||
|
|
|
@ -215,6 +215,7 @@ class ExceptionHandler {
|
|||
"input stream error",
|
||||
"invalid signature",
|
||||
"invalid password",
|
||||
"NetworkImage._loadAsync",
|
||||
// Temporary ignored, More context: Flutter secure storage reads the values as null some times
|
||||
// probably when the device was locked and then opened on Cake
|
||||
// this is solved by a restart of the app
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
import 'package:flutter/foundation.dart';
|
||||
|
||||
class FeatureFlag {
|
||||
static const bool isCakePayEnabled = false;
|
||||
static const bool isExolixEnabled = true;
|
||||
static const bool isInAppTorEnabled = false;
|
||||
static const bool isBackgroundSyncEnabled = false;
|
||||
static const int verificationWordsCount = 2;
|
||||
static const int verificationWordsCount = kDebugMode ? 0 : 2;
|
||||
}
|
|
@ -149,6 +149,9 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
|
|||
@observable
|
||||
BuySellQuotLoadingState buySellQuotState;
|
||||
|
||||
@observable
|
||||
bool skipIsReadyToTradeReaction = false;
|
||||
|
||||
@computed
|
||||
bool get isReadyToTrade {
|
||||
final hasSelectedQuote = selectedQuote != null;
|
||||
|
@ -266,6 +269,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
|
|||
}
|
||||
|
||||
void onTapChoseProvider(BuildContext context) async {
|
||||
skipIsReadyToTradeReaction = true;
|
||||
final initialQuotes = List<Quote>.from(sortedRecommendedQuotes + sortedQuotes);
|
||||
await calculateBestRate();
|
||||
final newQuotes = (sortedRecommendedQuotes + sortedQuotes);
|
||||
|
|
|
@ -20,7 +20,8 @@ part 'balance_view_model.g.dart';
|
|||
|
||||
class BalanceRecord {
|
||||
const BalanceRecord(
|
||||
{required this.availableBalance,
|
||||
{
|
||||
required this.availableBalance,
|
||||
required this.additionalBalance,
|
||||
required this.secondAvailableBalance,
|
||||
required this.secondAdditionalBalance,
|
||||
|
@ -148,26 +149,18 @@ abstract class BalanceViewModelBase with Store {
|
|||
|
||||
@computed
|
||||
String get availableBalanceLabel {
|
||||
switch (wallet.type) {
|
||||
case WalletType.monero:
|
||||
case WalletType.wownero:
|
||||
case WalletType.haven:
|
||||
case WalletType.ethereum:
|
||||
case WalletType.polygon:
|
||||
case WalletType.nano:
|
||||
case WalletType.banano:
|
||||
case WalletType.solana:
|
||||
case WalletType.tron:
|
||||
case WalletType.bitcoin:
|
||||
case WalletType.litecoin:
|
||||
case WalletType.bitcoinCash:
|
||||
case WalletType.none:
|
||||
return S.current.xmr_available_balance;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return S.current.show_balance;
|
||||
}
|
||||
else {
|
||||
return S.current.xmr_available_balance;
|
||||
}
|
||||
}
|
||||
|
||||
@computed
|
||||
String get additionalBalanceLabel {
|
||||
|
||||
switch (wallet.type) {
|
||||
case WalletType.haven:
|
||||
case WalletType.ethereum:
|
||||
|
@ -203,98 +196,35 @@ abstract class BalanceViewModelBase with Store {
|
|||
}
|
||||
}
|
||||
|
||||
@computed
|
||||
bool get hasMultiBalance => appStore.wallet!.type == WalletType.haven;
|
||||
|
||||
@computed
|
||||
String get availableBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
}
|
||||
|
||||
return walletBalance.formattedAvailableBalance;
|
||||
}
|
||||
|
||||
@computed
|
||||
String get frozenBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
}
|
||||
|
||||
return getFormattedFrozenBalance(walletBalance);
|
||||
}
|
||||
|
||||
@computed
|
||||
String get frozenFiatBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
final fiatCurrency = settingsStore.fiatCurrency;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
}
|
||||
|
||||
return _getFiatBalance(price: price, cryptoAmount: getFormattedFrozenBalance(walletBalance)) +
|
||||
' ${fiatCurrency.toString()}';
|
||||
}
|
||||
|
||||
@computed
|
||||
String get additionalBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
return '0.0';
|
||||
}
|
||||
|
||||
return walletBalance.formattedAdditionalBalance;
|
||||
}
|
||||
|
||||
@computed
|
||||
String get availableFiatBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
final fiatCurrency = settingsStore.fiatCurrency;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
}
|
||||
|
||||
return _getFiatBalance(price: price, cryptoAmount: walletBalance.formattedAvailableBalance) +
|
||||
' ${fiatCurrency.toString()}';
|
||||
}
|
||||
|
||||
@computed
|
||||
String get additionalFiatBalance {
|
||||
final walletBalance = _walletBalance;
|
||||
final fiatCurrency = settingsStore.fiatCurrency;
|
||||
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
return '---';
|
||||
}
|
||||
|
||||
return _getFiatBalance(price: price, cryptoAmount: walletBalance.formattedAdditionalBalance) +
|
||||
' ${fiatCurrency.toString()}';
|
||||
}
|
||||
|
||||
@computed
|
||||
Map<CryptoCurrency, BalanceRecord> get balances {
|
||||
return wallet.balance.map((key, value) {
|
||||
if (displayMode == BalanceDisplayMode.hiddenBalance) {
|
||||
final fiatCurrency = settingsStore.fiatCurrency;
|
||||
return MapEntry(
|
||||
key,
|
||||
BalanceRecord(
|
||||
availableBalance: '---',
|
||||
additionalBalance: '---',
|
||||
availableBalance: '●●●●●●',
|
||||
additionalBalance: additionalBalance,
|
||||
frozenBalance: '',
|
||||
secondAvailableBalance: '---',
|
||||
secondAdditionalBalance: '---',
|
||||
fiatAdditionalBalance: isFiatDisabled ? '' : '---',
|
||||
fiatAvailableBalance: isFiatDisabled ? '' : '---',
|
||||
fiatFrozenBalance: isFiatDisabled ? '' : '---',
|
||||
fiatSecondAvailableBalance: isFiatDisabled ? '' : '---',
|
||||
fiatSecondAdditionalBalance: isFiatDisabled ? '' : '---',
|
||||
secondAvailableBalance: '●●●●●●',
|
||||
secondAdditionalBalance: '●●●●●●',
|
||||
fiatAdditionalBalance: isFiatDisabled ? '' : '${fiatCurrency.toString()} ●●●●●',
|
||||
fiatAvailableBalance: isFiatDisabled ? '' : '${fiatCurrency.toString()} ●●●●●',
|
||||
fiatFrozenBalance: isFiatDisabled ? '' : '',
|
||||
fiatSecondAvailableBalance: isFiatDisabled ? '' : '${fiatCurrency.toString()} ●●●●●',
|
||||
fiatSecondAdditionalBalance: isFiatDisabled ? '' : '${fiatCurrency.toString()} ●●●●●',
|
||||
asset: key,
|
||||
formattedAssetTitle: _formatterAsset(key)));
|
||||
}
|
||||
|
@ -374,16 +304,11 @@ abstract class BalanceViewModelBase with Store {
|
|||
|
||||
bool _hasAdditionalBalanceForWalletType(WalletType type) {
|
||||
switch (type) {
|
||||
case WalletType.ethereum:
|
||||
case WalletType.polygon:
|
||||
case WalletType.solana:
|
||||
case WalletType.tron:
|
||||
case WalletType.bitcoin:
|
||||
case WalletType.bitcoinCash:
|
||||
case WalletType.litecoin:
|
||||
return false;
|
||||
default:
|
||||
case WalletType.monero:
|
||||
case WalletType.wownero:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -468,8 +393,6 @@ abstract class BalanceViewModelBase with Store {
|
|||
return balance;
|
||||
}
|
||||
|
||||
@computed
|
||||
CryptoCurrency get currency => appStore.wallet!.currency;
|
||||
|
||||
@observable
|
||||
bool isShowCard;
|
||||
|
|
|
@ -641,7 +641,7 @@ abstract class DashboardViewModelBase with Store {
|
|||
|
||||
transactions.clear();
|
||||
|
||||
transactions = ObservableList.of(
|
||||
transactions.addAll(
|
||||
wallet.transactionHistory.transactions.values.map(
|
||||
(transaction) => TransactionListItem(
|
||||
transaction: transaction,
|
||||
|
@ -703,7 +703,7 @@ abstract class DashboardViewModelBase with Store {
|
|||
monero!.getTransactionInfoAccountId(tx) == monero!.getCurrentAccount(wallet).id)
|
||||
.toList();
|
||||
|
||||
transactions = ObservableList.of(
|
||||
transactions.addAll(
|
||||
_accountTransactions.map(
|
||||
(transaction) => TransactionListItem(
|
||||
transaction: transaction,
|
||||
|
@ -723,7 +723,7 @@ abstract class DashboardViewModelBase with Store {
|
|||
wow.wownero!.getCurrentAccount(wallet).id)
|
||||
.toList();
|
||||
|
||||
transactions = ObservableList.of(
|
||||
transactions.addAll(
|
||||
_accountTransactions.map(
|
||||
(transaction) => TransactionListItem(
|
||||
transaction: transaction,
|
||||
|
|
|
@ -9,6 +9,7 @@ import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart'
|
|||
import 'package:cw_core/crypto_currency.dart';
|
||||
import 'package:cw_core/sync_status.dart';
|
||||
import 'package:cw_core/transaction_priority.dart';
|
||||
import 'package:cw_core/unspent_coin_type.dart';
|
||||
import 'package:cw_core/utils/print_verbose.dart';
|
||||
import 'package:cw_core/wallet_type.dart';
|
||||
import 'package:hive/hive.dart';
|
||||
|
@ -122,7 +123,8 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
|
|||
depositAmount = '';
|
||||
receiveAmount = '';
|
||||
receiveAddress = '';
|
||||
depositAddress = depositCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
depositAddress =
|
||||
depositCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
provider = providersForCurrentPair().first;
|
||||
final initialProvider = provider;
|
||||
provider!.checkIsAvailable().then((bool isAvailable) {
|
||||
|
@ -157,8 +159,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
|
|||
wallet.type == WalletType.bitcoinCash;
|
||||
|
||||
bool get hideAddressAfterExchange =>
|
||||
wallet.type == WalletType.monero ||
|
||||
wallet.type == WalletType.wownero;
|
||||
wallet.type == WalletType.monero || wallet.type == WalletType.wownero;
|
||||
|
||||
bool _useTorOnly;
|
||||
final Box<Trade> trades;
|
||||
|
@ -167,17 +168,17 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
|
|||
final SharedPreferences sharedPreferences;
|
||||
|
||||
List<ExchangeProvider> get _allProviders => [
|
||||
ChangeNowExchangeProvider(settingsStore: _settingsStore),
|
||||
SideShiftExchangeProvider(),
|
||||
SimpleSwapExchangeProvider(),
|
||||
ThorChainExchangeProvider(tradesStore: trades),
|
||||
if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),
|
||||
QuantexExchangeProvider(),
|
||||
LetsExchangeExchangeProvider(),
|
||||
StealthExExchangeProvider(),
|
||||
TrocadorExchangeProvider(
|
||||
useTorOnly: _useTorOnly, providerStates: _settingsStore.trocadorProviderStates),
|
||||
];
|
||||
ChangeNowExchangeProvider(settingsStore: _settingsStore),
|
||||
SideShiftExchangeProvider(),
|
||||
SimpleSwapExchangeProvider(),
|
||||
ThorChainExchangeProvider(tradesStore: trades),
|
||||
if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),
|
||||
QuantexExchangeProvider(),
|
||||
LetsExchangeExchangeProvider(),
|
||||
StealthExExchangeProvider(),
|
||||
TrocadorExchangeProvider(
|
||||
useTorOnly: _useTorOnly, providerStates: _settingsStore.trocadorProviderStates),
|
||||
];
|
||||
|
||||
@observable
|
||||
ExchangeProvider? provider;
|
||||
|
@ -613,8 +614,10 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
|
|||
isReceiveAmountEntered = false;
|
||||
depositAmount = '';
|
||||
receiveAmount = '';
|
||||
depositAddress = depositCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
receiveAddress = receiveCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
depositAddress =
|
||||
depositCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
receiveAddress =
|
||||
receiveCurrency == wallet.currency ? wallet.walletAddresses.addressForExchange : '';
|
||||
isDepositAddressEnabled = !(depositCurrency == wallet.currency);
|
||||
isFixedRateMode = false;
|
||||
_onPairChange();
|
||||
|
@ -640,7 +643,12 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
|
|||
wallet.type == WalletType.bitcoinCash) {
|
||||
final priority = _settingsStore.priority[wallet.type]!;
|
||||
|
||||
final amount = await bitcoin!.estimateFakeSendAllTxAmount(wallet, priority);
|
||||
final amount = await bitcoin!.estimateFakeSendAllTxAmount(
|
||||
wallet,
|
||||
priority,
|
||||
coinTypeToSpendFrom:
|
||||
wallet.type == WalletType.litecoin ? UnspentCoinType.nonMweb : UnspentCoinType.any,
|
||||
);
|
||||
|
||||
changeDepositAmount(amount: bitcoin!.formatterBitcoinAmountToString(amount: amount));
|
||||
}
|
||||
|
|
|
@ -394,7 +394,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
|
|||
|
||||
if (wallet.isHardwareWallet) state = IsAwaitingDeviceResponseState();
|
||||
|
||||
pendingTransaction = await wallet.createTransaction(_credentials());
|
||||
pendingTransaction = await wallet.createTransaction(_credentials(provider));
|
||||
|
||||
if (provider is ThorChainExchangeProvider) {
|
||||
final outputCount = pendingTransaction?.outputCount ?? 0;
|
||||
|
@ -522,7 +522,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
|
|||
void setTransactionPriority(TransactionPriority priority) =>
|
||||
_settingsStore.priority[wallet.type] = priority;
|
||||
|
||||
Object _credentials() {
|
||||
Object _credentials([ExchangeProvider? provider]) {
|
||||
final priority = _settingsStore.priority[wallet.type];
|
||||
|
||||
if (priority == null &&
|
||||
|
@ -535,7 +535,6 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
|
|||
|
||||
switch (wallet.type) {
|
||||
case WalletType.bitcoin:
|
||||
case WalletType.litecoin:
|
||||
case WalletType.bitcoinCash:
|
||||
return bitcoin!.createBitcoinTransactionCredentials(
|
||||
outputs,
|
||||
|
@ -543,6 +542,14 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
|
|||
feeRate: customBitcoinFeeRate,
|
||||
coinTypeToSpendFrom: coinTypeToSpendFrom,
|
||||
);
|
||||
case WalletType.litecoin:
|
||||
return bitcoin!.createBitcoinTransactionCredentials(
|
||||
outputs,
|
||||
priority: priority!,
|
||||
feeRate: customBitcoinFeeRate,
|
||||
// if it's an exchange flow then disable sending from mweb coins
|
||||
coinTypeToSpendFrom: provider != null ? UnspentCoinType.nonMweb : coinTypeToSpendFrom,
|
||||
);
|
||||
|
||||
case WalletType.monero:
|
||||
return monero!
|
||||
|
|
|
@ -29,6 +29,7 @@ abstract class WalletSeedViewModelBase with Store {
|
|||
List<String> get seedSplit => seed.split(RegExp(r'\s+'));
|
||||
|
||||
int get columnCount => seedSplit.length <= 16 ? 2 : 3;
|
||||
|
||||
double get columnAspectRatio => seedSplit.length <= 16 ? 1.8 : 2.8;
|
||||
|
||||
/// The indices of the seed to be verified.
|
||||
|
@ -60,8 +61,10 @@ abstract class WalletSeedViewModelBase with Store {
|
|||
bool isVerificationComplete = false;
|
||||
|
||||
void setupSeedVerification() {
|
||||
generateRandomIndices();
|
||||
generateOptions();
|
||||
if (verificationWordCount != 0) {
|
||||
generateRandomIndices();
|
||||
generateOptions();
|
||||
}
|
||||
}
|
||||
|
||||
/// Generate the indices of the seeds to be verified.
|
||||
|
|
|
@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
|
|||
if (use_header_bar) {
|
||||
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
|
||||
gtk_widget_show(GTK_WIDGET(header_bar));
|
||||
gtk_header_bar_set_title(header_bar, "cake_wallet");
|
||||
gtk_header_bar_set_title(header_bar, "Cake Wallet");
|
||||
gtk_header_bar_set_show_close_button(header_bar, TRUE);
|
||||
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
|
||||
} else {
|
||||
gtk_window_set_title(window, "cake_wallet");
|
||||
gtk_window_set_title(window, "Cake Wallet");
|
||||
}
|
||||
|
||||
gtk_window_set_default_size(window, 1280, 720);
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "مجموعات محفظة البذور المشتركة",
|
||||
"show": "يعرض",
|
||||
"show_address_book_popup": "عرض \"إضافة إلى كتاب العناوين\" المنبثقة بعد الإرسال",
|
||||
"show_balance": "اضغط لفترة طويلة لإظهار التوازن",
|
||||
"show_balance_toast": "اضغط لفترة طويلة لإخفاء أو إظهار التوازن",
|
||||
"show_details": "اظهر التفاصيل",
|
||||
"show_keys": "اظهار السييد / المفاتيح",
|
||||
"show_market_place": "إظهار السوق",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Споделени групи за портфейли за семена",
|
||||
"show": "Показване",
|
||||
"show_address_book_popup": "Показване на изскачането на „Добавяне към адресната книга“ след изпращане",
|
||||
"show_balance": "Дълго натиснете, за да покажете баланса",
|
||||
"show_balance_toast": "Дълго натискане, за да се скрие или покаже баланс",
|
||||
"show_details": "Показване на подробностите",
|
||||
"show_keys": "Покажи seed/keys",
|
||||
"show_market_place": "Покажи пазар",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Skupiny sdílených semen",
|
||||
"show": "Show",
|
||||
"show_address_book_popup": "Po odeslání zobrazíte vyskakovací okno „Přidat do adresáře“",
|
||||
"show_balance": "Dlouhý stisknutí zobrazí rovnováhu",
|
||||
"show_balance_toast": "Dlouhý stiskněte pro skrytí nebo zobrazení rovnováhy",
|
||||
"show_details": "Zobrazit detaily",
|
||||
"show_keys": "Zobrazit seed/klíče",
|
||||
"show_market_place": "Zobrazit trh",
|
||||
|
|
|
@ -511,8 +511,8 @@
|
|||
"placeholder_transactions": "Ihre Transaktionen werden hier angezeigt",
|
||||
"please_fill_totp": "Bitte geben Sie den 8-stelligen Code ein, der auf Ihrem anderen Gerät vorhanden ist",
|
||||
"please_make_selection": "Bitte treffen Sie unten eine Auswahl zum Erstellen oder Wiederherstellen Ihrer Wallet.",
|
||||
"please_reference_document": "Bitte verweisen Sie auf die folgenden Dokumente, um weitere Informationen zu erhalten.",
|
||||
"Please_reference_document": "Weitere Informationen finden Sie in den Dokumenten unten.",
|
||||
"please_reference_document": "Bitte verweisen Sie auf die folgenden Dokumente, um weitere Informationen zu erhalten.",
|
||||
"please_select": "Bitte auswählen:",
|
||||
"please_select_backup_file": "Bitte wählen Sie die Sicherungsdatei und geben Sie das Sicherungskennwort ein.",
|
||||
"please_try_to_connect_to_another_node": "Bitte versuchen Sie, sich mit einem anderen Knoten zu verbinden",
|
||||
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "Gemeinsame Walletsseed Gruppen",
|
||||
"show": "Zeigen",
|
||||
"show_address_book_popup": "Popup \"zum Adressbuch hinzufügen\" nach dem Senden anzeigen",
|
||||
"show_balance": "Lange Presse, um das Gleichgewicht zu zeigen",
|
||||
"show_balance_toast": "Lange Presse, um sich zu verbergen oder Gleichgewicht zu zeigen",
|
||||
"show_details": "Details anzeigen",
|
||||
"show_keys": "Seed/Schlüssel anzeigen",
|
||||
"show_market_place": "Marktplatz anzeigen",
|
||||
|
@ -989,4 +991,4 @@
|
|||
"you_will_get": "Konvertieren zu",
|
||||
"you_will_send": "Konvertieren von",
|
||||
"yy": "YY"
|
||||
}
|
||||
}
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Shared Seed Wallet Groups",
|
||||
"show": "Show",
|
||||
"show_address_book_popup": "Show 'Add to Address Book' popup after sending",
|
||||
"show_balance": "Long Press to Show Balance",
|
||||
"show_balance_toast": "Long press to hide or show balance",
|
||||
"show_details": "Show Details",
|
||||
"show_keys": "Show seed/keys",
|
||||
"show_market_place": "Show Marketplace",
|
||||
|
|
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "Grupos de billetera de semillas compartidas",
|
||||
"show": "Espectáculo",
|
||||
"show_address_book_popup": "Mostrar ventana emergente 'Agregar a la libreta de direcciones' después de enviar",
|
||||
"show_balance": "Prensa larga para mostrar equilibrio",
|
||||
"show_balance_toast": "Prensa larga para esconder o mostrar equilibrio",
|
||||
"show_details": "Mostrar detalles",
|
||||
"show_keys": "Mostrar semilla/claves",
|
||||
"show_market_place": "Mostrar mercado",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Groupes de portefeuilles partagés",
|
||||
"show": "Montrer",
|
||||
"show_address_book_popup": "Afficher la popup `` Ajouter au carnet d'adresses '' après avoir envoyé",
|
||||
"show_balance": "Longue presse pour montrer l'équilibre",
|
||||
"show_balance_toast": "Longue appuyez sur pour masquer ou afficher l'équilibre",
|
||||
"show_details": "Afficher les détails",
|
||||
"show_keys": "Visualiser la phrase secrète (seed) et les clefs",
|
||||
"show_market_place": "Afficher la place de marché",
|
||||
|
|
|
@ -732,6 +732,8 @@
|
|||
"shared_seed_wallet_groups": "Raba ƙungiya walat",
|
||||
"show": "Nuna",
|
||||
"show_address_book_popup": "Nuna 'ƙara don magance littafin' Popup bayan aikawa",
|
||||
"show_balance": "Dogon latsawa don nuna ma'auni",
|
||||
"show_balance_toast": "Latsa latsawa don ɓoye ko nuna ma'auni",
|
||||
"show_details": "Nuna Cikakkun bayanai",
|
||||
"show_keys": "Nuna iri/maɓallai",
|
||||
"show_market_place": "Nuna dan kasuwa",
|
||||
|
|
|
@ -732,6 +732,8 @@
|
|||
"shared_seed_wallet_groups": "साझा बीज बटुए समूह",
|
||||
"show": "दिखाओ",
|
||||
"show_address_book_popup": "भेजने के बाद 'एड एड्रेस बुक' पॉपअप दिखाएं",
|
||||
"show_balance": "बैलेंस दिखाने के लिए लॉन्ग प्रेस",
|
||||
"show_balance_toast": "बैलेंस को छिपाने या दिखाने के लिए लॉन्ग प्रेस",
|
||||
"show_details": "विवरण दिखाएं",
|
||||
"show_keys": "बीज / कुंजियाँ दिखाएँ",
|
||||
"show_market_place": "बाज़ार दिखाएँ",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Zajedničke grupe za sjeme novčanika",
|
||||
"show": "Pokazati",
|
||||
"show_address_book_popup": "Pokažite \"dodaj u adresar\" skočni prozor nakon slanja",
|
||||
"show_balance": "Dugački pritisak za pokazivanje ravnoteže",
|
||||
"show_balance_toast": "Dugo pritisnite da biste sakrili ili pokazali ravnotežu",
|
||||
"show_details": "Prikaži pojedinosti",
|
||||
"show_keys": "Prikaži pristupni izraz/ključ",
|
||||
"show_market_place": "Prikaži tržište",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Համօգտագործված սերմերի դրամապանակների խմբեր",
|
||||
"show": "Ցուցահանդես",
|
||||
"show_address_book_popup": "Show ույց տալ «Ուղարկելուց հետո« Հասցեների գրքի »թռուցիկ",
|
||||
"show_balance": "Երկար մամուլ, հավասարակշռությունը ցույց տալու համար",
|
||||
"show_balance_toast": "Երկար սեղմեք `հավասարակշռությունը թաքցնելու կամ ցույց տալու համար",
|
||||
"show_details": "Ցուցադրել մանրամասներ",
|
||||
"show_keys": "Ցուցադրել բանալիներ",
|
||||
"show_market_place": "Ցուցադրել շուկան",
|
||||
|
|
|
@ -733,6 +733,8 @@
|
|||
"shared_seed_wallet_groups": "Kelompok dompet benih bersama",
|
||||
"show": "Menunjukkan",
|
||||
"show_address_book_popup": "Tampilkan popup 'Tambahkan ke Alamat' setelah mengirim",
|
||||
"show_balance": "PRESS PANJANG UNTUK MENUNJUKKAN Balance",
|
||||
"show_balance_toast": "Tekan panjang untuk menyembunyikan atau menunjukkan keseimbangan",
|
||||
"show_details": "Tampilkan Rincian",
|
||||
"show_keys": "Tampilkan seed/kunci",
|
||||
"show_market_place": "Tampilkan Pasar",
|
||||
|
|
|
@ -732,6 +732,8 @@
|
|||
"shared_seed_wallet_groups": "Gruppi di portafoglio di semi condivisi",
|
||||
"show": "Spettacolo",
|
||||
"show_address_book_popup": "Mostra il popup \"Aggiungi alla rubrica\" dopo l'invio",
|
||||
"show_balance": "Lunga stampa per mostrare l'equilibrio",
|
||||
"show_balance_toast": "A lungo pressa per nascondere o mostrare l'equilibrio",
|
||||
"show_details": "Mostra dettagli",
|
||||
"show_keys": "Mostra seme/chiavi",
|
||||
"show_market_place": "Mostra mercato",
|
||||
|
|
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "共有シードウォレットグループ",
|
||||
"show": "見せる",
|
||||
"show_address_book_popup": "送信後に「アドレスブックに追加」ポップアップを表示します",
|
||||
"show_balance": "バランスを示すためにロングプレス",
|
||||
"show_balance_toast": "バランスを隠したり表示したりするためにロングプレス",
|
||||
"show_details": "詳細を表示",
|
||||
"show_keys": "シード/キーを表示する",
|
||||
"show_market_place": "マーケットプレイスを表示",
|
||||
|
|
|
@ -511,8 +511,8 @@
|
|||
"placeholder_transactions": "거래가 여기에 표시됩니다",
|
||||
"please_fill_totp": "다른 기기에 있는 8자리 코드를 입력하세요.",
|
||||
"please_make_selection": "아래에서 선택하십시오 지갑 만들기 또는 복구.",
|
||||
"Please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
|
||||
"please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
|
||||
"Please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
|
||||
"please_select": "선택 해주세요:",
|
||||
"please_select_backup_file": "백업 파일을 선택하고 백업 암호를 입력하십시오.",
|
||||
"please_try_to_connect_to_another_node": "다른 노드에 연결을 시도하십시오",
|
||||
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "공유 종자 지갑 그룹",
|
||||
"show": "보여주다",
|
||||
"show_address_book_popup": "전송 후 '주소 책에 추가'팝업을 표시하십시오",
|
||||
"show_balance": "균형을 보여주기 위해 긴 언론",
|
||||
"show_balance_toast": "균형을 숨기거나 보여주기 위해 긴 누르십시오",
|
||||
"show_details": "세부정보 표시",
|
||||
"show_keys": "시드 / 키 표시",
|
||||
"show_market_place": "마켓플레이스 표시",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "shared မျိုးစေ့ပိုက်ဆံအိတ်အုပ်စုများ",
|
||||
"show": "ပြသ",
|
||||
"show_address_book_popup": "ပေးပို့ပြီးနောက် 'address book' popup ကိုပြပါ",
|
||||
"show_balance": "ချိန်ခွင်လျှာကိုပြသရန်ရှည်လျားသောစာနယ်ဇင်း",
|
||||
"show_balance_toast": "ချိန်ခွင်လျှာကိုဖျောက်ရန်သို့မဟုတ်ပြသရန်ရှည်လျားသောစာနယ်ဇင်း",
|
||||
"show_details": "အသေးစိတ်ပြ",
|
||||
"show_keys": "မျိုးစေ့ /သော့များကို ပြပါ။",
|
||||
"show_market_place": "စျေးကွက်ကိုပြသပါ။",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Gedeelde zaadportelgroepen",
|
||||
"show": "Show",
|
||||
"show_address_book_popup": "Toon 'Toevoegen aan adresboek' pop -up na verzenden",
|
||||
"show_balance": "Lange pers om evenwicht te tonen",
|
||||
"show_balance_toast": "Lange pers om evenwicht te verbergen of te tonen",
|
||||
"show_details": "Toon details",
|
||||
"show_keys": "Toon zaad/sleutels",
|
||||
"show_market_place": "Toon Marktplaats",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Wspólne grupy portfeli nasion",
|
||||
"show": "Pokazywać",
|
||||
"show_address_book_popup": "Pokaż wysypkę „Dodaj do książki” po wysłaniu",
|
||||
"show_balance": "Długa prasa, aby pokazać równowagę",
|
||||
"show_balance_toast": "Długa naciśnij, aby ukryć lub pokazać równowagę",
|
||||
"show_details": "Pokaż szczegóły",
|
||||
"show_keys": "Pokaż seed/klucze",
|
||||
"show_market_place": "Pokaż rynek",
|
||||
|
|
|
@ -732,6 +732,8 @@
|
|||
"shared_seed_wallet_groups": "Grupos de carteira de sementes compartilhados",
|
||||
"show": "Mostrar",
|
||||
"show_address_book_popup": "Mostre pop -up 'Adicionar ao livro de endereços' depois de enviar",
|
||||
"show_balance": "Pressione há muito tempo para mostrar o equilíbrio",
|
||||
"show_balance_toast": "Pressione há muito tempo para se esconder ou mostrar equilíbrio",
|
||||
"show_details": "Mostrar detalhes",
|
||||
"show_keys": "Mostrar semente/chaves",
|
||||
"show_market_place": "Mostrar mercado",
|
||||
|
|
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "Общие группы кошелька семян",
|
||||
"show": "Показывать",
|
||||
"show_address_book_popup": "Покажите всплывающее окно «Добавить в адрес адреса» после отправки",
|
||||
"show_balance": "Длинная пресса, чтобы показать баланс",
|
||||
"show_balance_toast": "Длинная нажавка, чтобы скрыть или показать баланс",
|
||||
"show_details": "Показать детали",
|
||||
"show_keys": "Показать мнемоническую фразу/ключи",
|
||||
"show_market_place": "Показать торговую площадку",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "กลุ่มกระเป๋าเงินที่ใช้ร่วมกัน",
|
||||
"show": "แสดง",
|
||||
"show_address_book_popup": "แสดง 'เพิ่มในสมุดรายชื่อ' ป๊อปอัพหลังจากส่ง",
|
||||
"show_balance": "กดยาวเพื่อแสดงความสมดุล",
|
||||
"show_balance_toast": "กดนานเพื่อซ่อนหรือแสดงความสมดุล",
|
||||
"show_details": "แสดงรายละเอียด",
|
||||
"show_keys": "แสดงซีด/คีย์",
|
||||
"show_market_place": "แสดงตลาดกลาง",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Ibinahaging mga pangkat ng pitaka ng binhi",
|
||||
"show": "Ipakita",
|
||||
"show_address_book_popup": "Ipakita ang popup na 'Idagdag sa Address Book' pagkatapos magpadala",
|
||||
"show_balance": "Mahabang pindutin upang ipakita ang balanse",
|
||||
"show_balance_toast": "Mahabang pindutin upang itago o ipakita ang balanse",
|
||||
"show_details": "Ipakita ang mga detalye",
|
||||
"show_keys": "Ipakita ang mga seed/key",
|
||||
"show_market_place": "Ipakita ang Marketplace",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "Paylaşılan tohum cüzdan grupları",
|
||||
"show": "Göstermek",
|
||||
"show_address_book_popup": "Gönderdikten sonra 'adres defterine ekle' açılır",
|
||||
"show_balance": "Dengeyi Göstermek İçin Uzun Basın",
|
||||
"show_balance_toast": "Dengeyi gizlemek veya göstermek için uzun basın",
|
||||
"show_details": "Detayları Göster",
|
||||
"show_keys": "Tohumları/anahtarları göster",
|
||||
"show_market_place": "Pazar Yerini Göster",
|
||||
|
|
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "Спільні групи насіннєвих гаманців",
|
||||
"show": "Показувати",
|
||||
"show_address_book_popup": "Показати спливаюче вікно \"Додати до адресної книги\" після надсилання",
|
||||
"show_balance": "Довга преса, щоб показати рівновагу",
|
||||
"show_balance_toast": "Довга преса, щоб приховати або показати рівновагу",
|
||||
"show_details": "Показати деталі",
|
||||
"show_keys": "Показати мнемонічну фразу/ключі",
|
||||
"show_market_place": "Відображати маркетплейс",
|
||||
|
|
|
@ -732,6 +732,8 @@
|
|||
"shared_seed_wallet_groups": "مشترکہ بیج پرس گروپ",
|
||||
"show": "دکھائیں",
|
||||
"show_address_book_popup": "بھیجنے کے بعد 'ایڈریس میں شامل کریں کتاب' پاپ اپ دکھائیں",
|
||||
"show_balance": "توازن ظاہر کرنے کے لئے طویل پریس",
|
||||
"show_balance_toast": "توازن چھپانے یا ظاہر کرنے کے لئے طویل پریس",
|
||||
"show_details": "تفصیلات دکھائیں",
|
||||
"show_keys": "بیج / چابیاں دکھائیں۔",
|
||||
"show_market_place": "بازار دکھائیں۔",
|
||||
|
|
|
@ -729,6 +729,8 @@
|
|||
"shared_seed_wallet_groups": "Nhóm ví hạt được chia sẻ",
|
||||
"show": "Trình diễn",
|
||||
"show_address_book_popup": "Hiển thị cửa sổ bật lên 'Thêm vào sổ địa chỉ' sau khi gửi",
|
||||
"show_balance": "Báo chí dài để hiển thị sự cân bằng",
|
||||
"show_balance_toast": "Nhấn dài để ẩn hoặc hiển thị sự cân bằng",
|
||||
"show_details": "Hiển thị chi tiết",
|
||||
"show_keys": "Hiển thị hạt giống/khóa",
|
||||
"show_market_place": "Hiển thị Thị trường",
|
||||
|
|
|
@ -731,6 +731,8 @@
|
|||
"shared_seed_wallet_groups": "Awọn ẹgbẹ ti a pin irugbin",
|
||||
"show": "Fihan",
|
||||
"show_address_book_popup": "Fihan 'ṣafikun si Agbejade Iwe' Lẹhin fifiranṣẹ",
|
||||
"show_balance": "Tẹ Tẹ lati ṣafihan iwọntunwọnsi",
|
||||
"show_balance_toast": "Tẹ Tẹ lati tọju tabi ṣafihan iwọntunwọnsi",
|
||||
"show_details": "Fi ìsọfúnni kékeré hàn",
|
||||
"show_keys": "Wo hóró / àwọn kọ́kọ́rọ́",
|
||||
"show_market_place": "Wa Sopọ Pataki",
|
||||
|
|
|
@ -730,6 +730,8 @@
|
|||
"shared_seed_wallet_groups": "共享种子钱包组",
|
||||
"show": "展示",
|
||||
"show_address_book_popup": "发送后显示“添加到通讯簿”弹出窗口",
|
||||
"show_balance": "长印刷以显示平衡",
|
||||
"show_balance_toast": "长按以隐藏或显示平衡",
|
||||
"show_details": "显示详细信息",
|
||||
"show_keys": "显示种子/密钥",
|
||||
"show_market_place": "显示市场",
|
||||
|
|
|
@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
|
|||
APP_ANDROID_TYPE=$1
|
||||
|
||||
MONERO_COM_NAME="Monero.com"
|
||||
MONERO_COM_VERSION="1.19.0"
|
||||
MONERO_COM_BUILD_NUMBER=109
|
||||
MONERO_COM_VERSION="1.19.1"
|
||||
MONERO_COM_BUILD_NUMBER=110
|
||||
MONERO_COM_BUNDLE_ID="com.monero.app"
|
||||
MONERO_COM_PACKAGE="com.monero.app"
|
||||
MONERO_COM_SCHEME="monero.com"
|
||||
|
||||
CAKEWALLET_NAME="Cake Wallet"
|
||||
CAKEWALLET_VERSION="4.22.0"
|
||||
CAKEWALLET_BUILD_NUMBER=240
|
||||
CAKEWALLET_VERSION="4.22.1"
|
||||
CAKEWALLET_BUILD_NUMBER=241
|
||||
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
|
||||
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
|
||||
CAKEWALLET_SCHEME="cakewallet"
|
||||
|
|
|
@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
|
|||
APP_IOS_TYPE=$1
|
||||
|
||||
MONERO_COM_NAME="Monero.com"
|
||||
MONERO_COM_VERSION="1.19.0"
|
||||
MONERO_COM_BUILD_NUMBER=106
|
||||
MONERO_COM_VERSION="1.19.1"
|
||||
MONERO_COM_BUILD_NUMBER=107
|
||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||
|
||||
CAKEWALLET_NAME="Cake Wallet"
|
||||
CAKEWALLET_VERSION="4.22.0"
|
||||
CAKEWALLET_BUILD_NUMBER=287
|
||||
CAKEWALLET_VERSION="4.22.1"
|
||||
CAKEWALLET_BUILD_NUMBER=288
|
||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||
|
||||
HAVEN_NAME="Haven"
|
||||
|
|
|
@ -14,8 +14,8 @@ if [ -n "$1" ]; then
|
|||
fi
|
||||
|
||||
CAKEWALLET_NAME="Cake Wallet"
|
||||
CAKEWALLET_VERSION="1.12.0"
|
||||
CAKEWALLET_BUILD_NUMBER=41
|
||||
CAKEWALLET_VERSION="1.12.1"
|
||||
CAKEWALLET_BUILD_NUMBER=42
|
||||
|
||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
|
||||
echo "Wrong app type."
|
||||
|
|
|
@ -16,13 +16,13 @@ if [ -n "$1" ]; then
|
|||
fi
|
||||
|
||||
MONERO_COM_NAME="Monero.com"
|
||||
MONERO_COM_VERSION="1.9.0"
|
||||
MONERO_COM_BUILD_NUMBER=39
|
||||
MONERO_COM_VERSION="1.9.1"
|
||||
MONERO_COM_BUILD_NUMBER=40
|
||||
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
|
||||
|
||||
CAKEWALLET_NAME="Cake Wallet"
|
||||
CAKEWALLET_VERSION="1.15.0"
|
||||
CAKEWALLET_BUILD_NUMBER=99
|
||||
CAKEWALLET_VERSION="1.15.1"
|
||||
CAKEWALLET_BUILD_NUMBER=100
|
||||
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
|
||||
|
||||
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define MyAppName "Cake Wallet"
|
||||
#define MyAppVersion "0.3.0"
|
||||
#define MyAppVersion "0.3.1"
|
||||
#define MyAppPublisher "Cake Labs LLC"
|
||||
#define MyAppURL "https://cakewallet.com/"
|
||||
#define MyAppExeName "CakeWallet.exe"
|
||||
|
|
|
@ -109,7 +109,6 @@ import 'package:cw_bitcoin/electrum.dart';
|
|||
import 'package:cw_bitcoin/electrum_transaction_info.dart';
|
||||
import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_receive_page_option.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_wallet.dart';
|
||||
import 'package:cw_bitcoin/electrum_wallet.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_unspent.dart';
|
||||
import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
|
||||
|
@ -173,7 +172,8 @@ abstract class Bitcoin {
|
|||
List<ElectrumSubAddress> getSilentPaymentAddresses(Object wallet);
|
||||
List<ElectrumSubAddress> getSilentPaymentReceivedAddresses(Object wallet);
|
||||
|
||||
Future<int> estimateFakeSendAllTxAmount(Object wallet, TransactionPriority priority);
|
||||
Future<int> estimateFakeSendAllTxAmount(Object wallet, TransactionPriority priority,
|
||||
{UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any});
|
||||
List<ElectrumSubAddress> getSubAddresses(Object wallet);
|
||||
|
||||
String formatterBitcoinAmountToString({required int amount});
|
||||
|
@ -387,6 +387,8 @@ abstract class Monero {
|
|||
|
||||
String exportOutputsUR(Object wallet, bool all);
|
||||
|
||||
bool needExportOutputs(Object wallet, int amount);
|
||||
|
||||
bool importKeyImagesUR(Object wallet, String ur);
|
||||
|
||||
WalletCredentials createMoneroRestoreWalletFromKeysCredentials({
|
||||
|
|
Loading…
Reference in a new issue