android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 20:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Add tari_wallet_addresses to cw file generator

Browse source
This commit is contained in:
Konstantin Ullrich 2025-05-06 11:12:36 +02:00
parent 9c7716c0a9
commit f26e04b7c3
No known key found for this signature in database
GPG key ID: 6B3199AD9B3D23B8
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cw_tari/lib/tari_wallet.dart
View file

@ -96,7 +96,6 @@ abstract class TariWalletBase
try { try {
syncStatus = AttemptingSyncStatus(); syncStatus = AttemptingSyncStatus();
_walletFfi.setBaseNode();
_walletFfi.startRecovery((_, int status, int val1, int val2) async { _walletFfi.startRecovery((_, int status, int val1, int val2) async {
print('recoveryCallback called $status $val1 $val2'); print('recoveryCallback called $status $val1 $val2');
@ -252,7 +251,11 @@ abstract class TariWalletBase
Future<void> dev_printLogs() async { Future<void> dev_printLogs() async {
final currentWalletPath = final currentWalletPath =
await pathForWallet(name: walletInfo.name, type: type); await pathForWallet(name: walletInfo.name, type: type);
log(File("$currentWalletPath/logs/wallet.log").readAsStringSync()); Directory("$currentWalletPath/logs").listSync().forEach((e) => log(e.path));
final stat = await File("$currentWalletPath/logs/wallet.log").stat();
log(stat.size.toString());
File("$currentWalletPath/logs/wallet.0.log").readAsString().then((e) => log(e));
} }
@override @override

8
cw_tari/lib/tari_wallet_service.dart
View file

@ -83,7 +83,7 @@ class TariWalletService extends WalletService<
passphrase: credentials.password!, passphrase: credentials.password!,
logPath: "$path/logs/wallet.log", logPath: "$path/logs/wallet.log",
logLevel: 4, logLevel: 4,
dnsSeeds: "seeds.nextnet.tari.com", dnsSeeds: "seeds.tari.com",
callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction, callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction,
callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply, callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply,
callbackReceivedFinalizedTransaction: CallbackPlaceholders.callbackReceivedFinalizedTransaction, callbackReceivedFinalizedTransaction: CallbackPlaceholders.callbackReceivedFinalizedTransaction,
@ -133,14 +133,14 @@ class TariWalletService extends WalletService<
transport: connection, transport: connection,
); );
await File("$path/logs/wallet.log").delete(); await Directory("$path/logs").delete(recursive: true);
final tariWallet = tari.createWallet( final tariWallet = tari.createWallet(
commsConfig: config, commsConfig: config,
passphrase: password, passphrase: password,
logPath: "$path/logs/wallet.log", logPath: "$path/logs/wallet.log",
logLevel: 4, logLevel: 4,
dnsSeeds: "seeds.nextnet.tari.com", dnsSeeds: "seeds.tari.com",
dnsSeedNameServers: '1.1.1.1:853', dnsSeedNameServers: '1.1.1.1:853',
callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction, callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction,
callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply, callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply,
@ -244,7 +244,7 @@ class TariWalletService extends WalletService<
mnemonic: credentials.mnemonic, mnemonic: credentials.mnemonic,
logPath: "$path/logs/wallet.log", logPath: "$path/logs/wallet.log",
logLevel: 4, logLevel: 4,
dnsSeeds: "seeds.nextnet.tari.com", dnsSeeds: "seeds.tari.com",
callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction, callbackReceivedTransaction: CallbackPlaceholders.callbackReceivedTransaction,
callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply, callbackReceivedTransactionReply: CallbackPlaceholders.callbackReceivedTransactionReply,
callbackReceivedFinalizedTransaction: CallbackPlaceholders.callbackReceivedFinalizedTransaction, callbackReceivedFinalizedTransaction: CallbackPlaceholders.callbackReceivedFinalizedTransaction,

2
lib/src/screens/settings/other_settings_page.dart
View file

@ -79,7 +79,7 @@ class OtherSettingsPage extends BasePage {
), ),
if (_otherSettingsViewModel.walletType == WalletType.tari) if (_otherSettingsViewModel.walletType == WalletType.tari)
SettingsSwitcherCell( SettingsSwitcherCell(
title: "${S.of(context).use_tari_emoji_address} 🤮", title: S.of(context).use_tari_emoji_address,
value: _otherSettingsViewModel.useTariEmojiAddress, value: _otherSettingsViewModel.useTariEmojiAddress,
onValueChange: (_, bool value) { onValueChange: (_, bool value) {
_otherSettingsViewModel.setUseTariEmojiAddress(value); _otherSettingsViewModel.setUseTariEmojiAddress(value);

1
tool/configure.dart
View file

@ -1399,6 +1399,7 @@ import 'package:hive/hive.dart';
"""; """;
const tariCWHeaders = """ const tariCWHeaders = """
import 'package:cw_tari/tari_wallet.dart'; import 'package:cw_tari/tari_wallet.dart';
import 'package:cw_tari/tari_wallet_addresses.dart';
import 'package:cw_tari/tari_wallet_service.dart'; import 'package:cw_tari/tari_wallet_service.dart';
import 'package:cw_tari/wordlist.dart'; import 'package:cw_tari/wordlist.dart';
"""; """;