mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-03-12 09:32:33 +00:00
Merge branch 'CW-459-12-words-btc' of https://github.com/cake-tech/cake_wallet into CW-459-12-words-btc
This commit is contained in:
commit
4e5a707c52
4 changed files with 4 additions and 4 deletions
cw_monero
lib/bitcoin
tool
|
@ -234,7 +234,6 @@ extern "C"
|
||||||
}
|
}
|
||||||
|
|
||||||
void setUnlocked(bool unlocked);
|
void setUnlocked(bool unlocked);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Monero::Coins *m_coins;
|
Monero::Coins *m_coins;
|
||||||
|
@ -568,7 +567,7 @@ extern "C"
|
||||||
_preferred_inputs.insert(std::string(*preferred_inputs));
|
_preferred_inputs.insert(std::string(*preferred_inputs));
|
||||||
preferred_inputs++;
|
preferred_inputs++;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto priority = static_cast<Monero::PendingTransaction::Priority>(priority_raw);
|
auto priority = static_cast<Monero::PendingTransaction::Priority>(priority_raw);
|
||||||
std::string _payment_id;
|
std::string _payment_id;
|
||||||
Monero::PendingTransaction *transaction;
|
Monero::PendingTransaction *transaction;
|
||||||
|
|
|
@ -57,7 +57,7 @@ class MoneroWalletService extends WalletService<
|
||||||
|
|
||||||
final Box<WalletInfo> walletInfoSource;
|
final Box<WalletInfo> walletInfoSource;
|
||||||
final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
|
final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
|
||||||
|
|
||||||
static bool walletFilesExist(String path) =>
|
static bool walletFilesExist(String path) =>
|
||||||
!File(path).existsSync() && !File('$path.keys').existsSync();
|
!File(path).existsSync() && !File('$path.keys').existsSync();
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
part of 'bitcoin.dart';
|
part of 'bitcoin.dart';
|
||||||
|
|
||||||
class CWBitcoin extends Bitcoin {
|
class CWBitcoin extends Bitcoin {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
TransactionPriority getMediumTransactionPriority() => BitcoinTransactionPriority.medium;
|
TransactionPriority getMediumTransactionPriority() => BitcoinTransactionPriority.medium;
|
||||||
|
|
||||||
|
|
|
@ -19,4 +19,4 @@ void main(List<String> args) async {
|
||||||
|
|
||||||
appendStringToArbFile(fileName, name, translation);
|
appendStringToArbFile(fileName, name, translation);
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue