Merge branch 'MrCyjaneK-cyjan-monerodart' of https://github.com/cake-tech/cake_wallet into wownero

 Conflicts:
	cw_monero/lib/api/wallet.dart
	cw_monero/lib/monero_wallet.dart
This commit is contained in:
OmarHatem 2024-06-28 16:18:48 +03:00
commit b44cd1bda0
5 changed files with 49 additions and 10 deletions

View file

@ -30,7 +30,6 @@ List<Transaction> getAllTransactions() {
return List.generate(size, (index) => Transaction(txInfo: monero.TransactionHistory_transaction(txhistory!, index: index)));
}
// TODO(mrcyjanek): ...
Transaction getTransaction(String txId) {
return Transaction(txInfo: monero.TransactionHistory_transactionById(txhistory!, txid: txId));
}

View file

@ -52,7 +52,7 @@ String getSeedLegacy(String? language) {
return legacy;
}
String getAddress({int accountIndex = 0, int addressIndex = 1}) =>
String getAddress({int accountIndex = 0, int addressIndex = 0}) =>
monero.Wallet_address(wptr!,
accountIndex: accountIndex, addressIndex: addressIndex);
@ -112,9 +112,6 @@ void startRefreshSync() {
monero.Wallet_startRefresh(wptr!);
}
Future<bool> connectToNode() async {
return true;
}
void setRefreshFromBlockHeight({required int height}) =>
monero.Wallet_setRefreshFromBlockHeight(wptr!,
@ -127,7 +124,7 @@ final storeMutex = Mutex();
void storeSync() async {
await storeMutex.acquire();
final addr = wptr!.address;
Isolate.run(() {
await Isolate.run(() {
monero.Wallet_store(Pointer.fromAddress(addr));
});
storeMutex.release();

View file

@ -268,7 +268,7 @@ void _restoreFromSpendKey(Map<String, dynamic> args) {
Future<void> _openWallet(Map<String, String> args) async => loadWallet(
path: args['path'] as String, password: args['password'] as String);
Future<bool> _isWalletExist(String path) async => isWalletExistSync(path: path);
bool _isWalletExist(String path) => isWalletExistSync(path: path);
void openWallet(
{required String path,
@ -343,4 +343,4 @@ Future<void> restoreFromSpendKey(
'restoreHeight': restoreHeight
});
Future<bool> isWalletExist({required String path}) => _isWalletExist(path);
bool isWalletExist({required String path}) => _isWalletExist(path);

View file

@ -481,8 +481,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
monero.CoinsInfo_unlocked(coin),
);
if (unspent.hash.isNotEmpty) {
unspent.isChange =
transaction_history.getTransaction(unspent.hash) == 1;
unspent.isChange = transaction_history.getTransaction(unspent.hash).isSpend == true;
}
unspentCoins.add(unspent);
}

View file

@ -0,0 +1,44 @@
#define MyAppName "Cake Wallet"
#define MyAppVersion "0.0.1"
#define MyAppPublisher "Cake Labs LLC"
#define MyAppURL "https://cakewallet.com/"
#define MyAppExeName "CakeWallet.exe"
[Setup]
AppId=com.cakewallet.cakewallet
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={autopf}\CakeWallet
DisableProgramGroupPage=yes
LicenseFile=..\..\LICENSE.md
; Uncomment the following line to run in non administrative install mode (install for current user only.)
; PrivilegesRequired=lowest
OutputDir=..\..\
OutputBaseFilename=cakewallet_setup
SetupIconFile=..\..\windows\runner\resources\app_icon.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "..\..\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]
Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
[Run]
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent