Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-25 11:45:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

epic isar fixes

Browse source
This commit is contained in:
julian 2023-01-18 09:42:46 -06:00
parent cd4408449c
commit 719f70697a
1 changed files with 72 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
lib/services/coins/epiccash/epiccash_wallet.dart
View file

@ -657,8 +657,8 @@ class EpicCashWallet extends CoinServiceAPI
int? currentReceivingIndex; int? currentReceivingIndex;
for (int i = 0; i <= receivingIndex!; i++) { for (int i = 0; i <= receivingIndex!; i++) {
final indexesAddress = await _getCurrentAddressForChain(i); final indexesAddress = await _getReceivingAddressForIndex(i);
if (indexesAddress == sendersAddress) { if (indexesAddress.value == sendersAddress) {
currentReceivingIndex = i; currentReceivingIndex = i;
break; break;
} }
@ -829,32 +829,52 @@ class EpicCashWallet extends CoinServiceAPI
} }
} }
/// Returns the latest receiving/change (external/internal) address for the wallet depending on [chain] Future<isar_models.Address> _getReceivingAddressForIndex(
/// and int index,
/// [chain] - Use 0 for receiving (external), 1 for change (internal). Should not be any other value!
Future<String> _getCurrentAddressForChain(
int chain,
) async { ) async {
final wallet = await _secureStore.read(key: '${_walletId}_wallet'); isar_models.Address? address = await db
final epicboxConfig = .getAddresses(walletId)
await _secureStore.read(key: '${_walletId}_epicboxConfig'); .filter()
.derivationIndexEqualTo(index)
.findFirst();
String? walletAddress; if (address == null) {
await m.protect(() async { final wallet = await _secureStore.read(key: '${_walletId}_wallet');
walletAddress = await compute( final epicboxConfig =
_initGetAddressInfoWrapper, await _secureStore.read(key: '${_walletId}_epicboxConfig');
Tuple3(wallet!, chain, epicboxConfig!),
String? walletAddress;
await m.protect(() async {
walletAddress = await compute(
_initGetAddressInfoWrapper,
Tuple3(wallet!, index, epicboxConfig!),
);
});
Logging.instance
.log("WALLET_ADDRESS_IS $walletAddress", level: LogLevel.Info);
address = isar_models.Address(
walletId: walletId,
value: walletAddress!,
derivationIndex: index,
type: isar_models.AddressType.mimbleWimble,
subType: isar_models.AddressSubType.receiving,
publicKey: [], // ??
); );
});
Logging.instance await db.putAddress(address);
.log("WALLET_ADDRESS_IS $walletAddress", level: LogLevel.Info); }
return walletAddress!;
return address;
} }
@override @override
Future<String> get currentReceivingAddress => Future<String> get currentReceivingAddress async =>
_currentReceivingAddress ??= _getCurrentAddressForChain(0); (await _currentReceivingAddress)?.value ??
Future<String>? _currentReceivingAddress; (await _getReceivingAddressForIndex(0)).value;
Future<isar_models.Address?> get _currentReceivingAddress =>
db.getAddresses(walletId).sortByDerivationIndexDesc().findFirst();
@override @override
Future<void> exit() async { Future<void> exit() async {
@ -1059,6 +1079,11 @@ class EpicCashWallet extends CoinServiceAPI
epicUpdateReceivingIndex(0), epicUpdateReceivingIndex(0),
epicUpdateChangeIndex(0), epicUpdateChangeIndex(0),
]); ]);
await isarInit(walletId);
final initialReceivingAddress = await _getReceivingAddressForIndex(0);
await db.putAddress(initialReceivingAddress);
} }
bool refreshMutex = false; bool refreshMutex = false;
@ -1535,7 +1560,7 @@ class EpicCashWallet extends CoinServiceAPI
receivingIndex != null && currentReceivingIndex <= receivingIndex; receivingIndex != null && currentReceivingIndex <= receivingIndex;
currentReceivingIndex++) { currentReceivingIndex++) {
final currentAddress = final currentAddress =
await _getCurrentAddressForChain(currentReceivingIndex); await _getReceivingAddressForIndex(currentReceivingIndex);
final wallet = await _secureStore.read(key: '${_walletId}_wallet'); final wallet = await _secureStore.read(key: '${_walletId}_wallet');
final epicboxConfig = final epicboxConfig =
await _secureStore.read(key: '${_walletId}_epicboxConfig'); await _secureStore.read(key: '${_walletId}_epicboxConfig');
@ -1564,7 +1589,7 @@ class EpicCashWallet extends CoinServiceAPI
Logging.instance Logging.instance
.log(subscribeRequest['signature'], level: LogLevel.Info); // .log(subscribeRequest['signature'], level: LogLevel.Info); //
final unprocessedSlates = await getSlates( final unprocessedSlates = await getSlates(
currentAddress, subscribeRequest['signature'] as String); currentAddress.value, subscribeRequest['signature'] as String);
if (unprocessedSlates == null || unprocessedSlates is! List) { if (unprocessedSlates == null || unprocessedSlates is! List) {
Logging.instance.log( Logging.instance.log(
"index $currentReceivingIndex at ${await currentReceivingAddress} does not have any slates", "index $currentReceivingIndex at ${await currentReceivingAddress} does not have any slates",
@ -1630,7 +1655,7 @@ class EpicCashWallet extends CoinServiceAPI
if (response == "") { if (response == "") {
Logging.instance.log("response: ${response.runtimeType}", Logging.instance.log("response: ${response.runtimeType}",
level: LogLevel.Info); level: LogLevel.Info);
await deleteSlate(currentAddress, await deleteSlate(currentAddress.value,
subscribeRequest['signature'] as String, slate as String); subscribeRequest['signature'] as String, slate as String);
} }
@ -1639,7 +1664,7 @@ class EpicCashWallet extends CoinServiceAPI
//Already processed - to be deleted //Already processed - to be deleted
Logging.instance Logging.instance
.log("DELETING_PROCESSED_SLATE", level: LogLevel.Info); .log("DELETING_PROCESSED_SLATE", level: LogLevel.Info);
final slateDelete = await deleteSlate(currentAddress, final slateDelete = await deleteSlate(currentAddress.value,
subscribeRequest['signature'] as String, slate as String); subscribeRequest['signature'] as String, slate as String);
Logging.instance.log("DELETE_SLATE_RESPONSE $slateDelete", Logging.instance.log("DELETE_SLATE_RESPONSE $slateDelete",
level: LogLevel.Info); level: LogLevel.Info);
@ -1659,7 +1684,7 @@ class EpicCashWallet extends CoinServiceAPI
final postSlateToServer = final postSlateToServer =
await postSlate(slateSender, encryptedSlate); await postSlate(slateSender, encryptedSlate);
await deleteSlate(currentAddress, await deleteSlate(currentAddress.value,
subscribeRequest['signature'] as String, slate as String); subscribeRequest['signature'] as String, slate as String);
Logging.instance.log("POST_SLATE_RESPONSE $postSlateToServer", Logging.instance.log("POST_SLATE_RESPONSE $postSlateToServer",
level: LogLevel.Info); level: LogLevel.Info);
@ -1676,7 +1701,7 @@ class EpicCashWallet extends CoinServiceAPI
Logging.instance Logging.instance
.log("TX_SLATE_ID_IS $txSlateId", level: LogLevel.Info); .log("TX_SLATE_ID_IS $txSlateId", level: LogLevel.Info);
final postToNode = await postSlateToNode(wallet, txSlateId); final postToNode = await postSlateToNode(wallet, txSlateId);
await deleteSlate(currentAddress, await deleteSlate(currentAddress.value,
subscribeRequest['signature'] as String, slate as String); subscribeRequest['signature'] as String, slate as String);
Logging.instance.log("POST_SLATE_RESPONSE $postToNode", Logging.instance.log("POST_SLATE_RESPONSE $postToNode",
level: LogLevel.Info); level: LogLevel.Info);
@ -1709,7 +1734,7 @@ class EpicCashWallet extends CoinServiceAPI
receivingIndex != null && currentReceivingIndex <= receivingIndex; receivingIndex != null && currentReceivingIndex <= receivingIndex;
currentReceivingIndex++) { currentReceivingIndex++) {
final receiveAddress = final receiveAddress =
await _getCurrentAddressForChain(currentReceivingIndex); await _getReceivingAddressForIndex(currentReceivingIndex);
dynamic subscribeRequest; dynamic subscribeRequest;
await m.protect(() async { await m.protect(() async {
@ -1733,7 +1758,7 @@ class EpicCashWallet extends CoinServiceAPI
level: LogLevel.Info); level: LogLevel.Info);
}); });
String? signature = subscribeRequest['signature'] as String?; String? signature = subscribeRequest['signature'] as String?;
final cancels = await getCancels(receiveAddress, signature!); final cancels = await getCancels(receiveAddress.value, signature!);
final slatesToCommits = await getSlatesToCommits(); final slatesToCommits = await getSlatesToCommits();
for (final cancel in cancels as List<dynamic>) { for (final cancel in cancels as List<dynamic>) {
@ -1801,7 +1826,7 @@ class EpicCashWallet extends CoinServiceAPI
} }
final int curAdd = await setCurrentIndex(); final int curAdd = await setCurrentIndex();
_currentReceivingAddress = _getCurrentAddressForChain(curAdd); await _getReceivingAddressForIndex(curAdd);
if (!await startScans()) { if (!await startScans()) {
refreshMutex = false; refreshMutex = false;
@ -1990,7 +2015,9 @@ class EpicCashWallet extends CoinServiceAPI
final String transactions = message['result'] as String; final String transactions = message['result'] as String;
final jsonTransactions = json.decode(transactions) as List; final jsonTransactions = json.decode(transactions) as List;
final List<isar_models.Transaction> midSortedArray = []; final List<
Tuple4<isar_models.Transaction, List<isar_models.Output>,
List<isar_models.Input>, isar_models.Address?>> txnsData = [];
// int latestTxnBlockHeight = // int latestTxnBlockHeight =
// DB.instance.get<dynamic>(boxName: walletId, key: "storedTxnDataHeight") // DB.instance.get<dynamic>(boxName: walletId, key: "storedTxnDataHeight")
@ -2000,9 +2027,8 @@ class EpicCashWallet extends CoinServiceAPI
for (var tx in jsonTransactions) { for (var tx in jsonTransactions) {
Logging.instance.log("tx: $tx", level: LogLevel.Info); Logging.instance.log("tx: $tx", level: LogLevel.Info);
final txHeight = tx["kernel_lookup_min_height"] as int? ?? 0;
// // TODO: does "confirmed" mean finalized? If so please remove this todo // // TODO: does "confirmed" mean finalized? If so please remove this todo
// final isConfirmed = tx["confirmed"] as bool; final isConfirmed = tx["confirmed"] as bool;
// // TODO: since we are now caching tx history in hive are we losing anything by skipping here? // // TODO: since we are now caching tx history in hive are we losing anything by skipping here?
// // TODO: we can skip this filtering if it causes issues as the cache is later merged with updated data anyways // // TODO: we can skip this filtering if it causes issues as the cache is later merged with updated data anyways
// // this would just make processing and updating cache more efficient // // this would just make processing and updating cache more efficient
@ -2032,6 +2058,14 @@ class EpicCashWallet extends CoinServiceAPI
""; "";
String? commitId = slatesToCommits[slateId]?['commitId'] as String?; String? commitId = slatesToCommits[slateId]?['commitId'] as String?;
int? height;
if (isConfirmed) {
height = tx["kernel_lookup_min_height"] as int? ?? 1;
} else {
height = null;
}
final txn = isar_models.Transaction( final txn = isar_models.Transaction(
walletId: walletId, walletId: walletId,
txid: commitId ?? tx["id"].toString(), txid: commitId ?? tx["id"].toString(),
@ -2043,7 +2077,7 @@ class EpicCashWallet extends CoinServiceAPI
subType: isar_models.TransactionSubType.none, subType: isar_models.TransactionSubType.none,
amount: amt, amount: amt,
fee: (tx["fee"] == null) ? 0 : int.parse(tx["fee"] as String), fee: (tx["fee"] == null) ? 0 : int.parse(tx["fee"] as String),
height: txHeight, height: height,
isCancelled: tx["tx_type"] == "TxSentCancelled" || isCancelled: tx["tx_type"] == "TxSentCancelled" ||
tx["tx_type"] == "TxReceivedCancelled", tx["tx_type"] == "TxReceivedCancelled",
isLelantus: false, isLelantus: false,
@ -2053,12 +2087,11 @@ class EpicCashWallet extends CoinServiceAPI
// txn.address = // txn.address =
// ""; // for this when you send a transaction you will just need to save in a hashmap in hive with the key being the txid, and the value being the address it was sent to. then you can look this value up right here in your hashmap. // ""; // for this when you send a transaction you will just need to save in a hashmap in hive with the key being the txid, and the value being the address it was sent to. then you can look this value up right here in your hashmap.
txn.address.value = await db isar_models.Address? transactionAddress = await db
.getAddresses(walletId) .getAddresses(walletId)
.filter() .filter()
.valueEqualTo(address) .valueEqualTo(address)
.findFirst(); .findFirst();
// //
// midSortedTx["inputSize"] = tx["num_inputs"]; // midSortedTx["inputSize"] = tx["num_inputs"];
// midSortedTx["outputSize"] = tx["num_outputs"]; // midSortedTx["outputSize"] = tx["num_outputs"];
@ -2073,13 +2106,13 @@ class EpicCashWallet extends CoinServiceAPI
// latestTxnBlockHeight = txHeight; // latestTxnBlockHeight = txHeight;
// } // }
midSortedArray.add(txn); txnsData.add(Tuple4(txn, [], [], transactionAddress));
// cachedMap?.remove(tx["id"].toString()); // cachedMap?.remove(tx["id"].toString());
// cachedMap?.remove(commitId); // cachedMap?.remove(commitId);
// Logging.instance.log("cmap: $cachedMap", level: LogLevel.Info); // Logging.instance.log("cmap: $cachedMap", level: LogLevel.Info);
} }
await db.putTransactions(midSortedArray); await addNewTransactionData(txnsData, walletId);
// midSortedArray // midSortedArray
// .sort((a, b) => (b["timestamp"] as int) - (a["timestamp"] as int)); // .sort((a, b) => (b["timestamp"] as int) - (a["timestamp"] as int));