Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-03-26 00:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP generateChangeAddress->createNewReservedChangeAddress

Browse source
This commit is contained in:
sneurlax 2023-08-07 14:15:08 -05:00
parent e4aa34509a
commit 32c0c55830
2 changed files with 20 additions and 20 deletions

2
fusiondart

@ -1 +1 @@
Subproject commit 79e435cfe1e099efd5b2ac39c8b8ed3d83fd8c50
Subproject commit 20bf6d3c671f50b43831bbf29c62763ae65af3fe

38
lib/services/mixins/fusion_interface.dart
View file

@ -1,13 +1,12 @@
import 'dart:io';
import 'package:fusiondart/fusiondart.dart';
import 'package:fusiondart/src/models/address.dart' as fusion_address;
import 'package:fusiondart/src/models/address.dart' as cash_fusion;
import 'package:isar/isar.dart';
import 'package:stackwallet/db/isar/main_db.dart';
import 'package:stackwallet/models/isar/models/isar_models.dart';
import 'package:stackwallet/utilities/enums/coin_enum.dart';
import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart';
import 'package:stackwallet/utilities/logger.dart';
const String kReservedFusionAddress = "reserved_fusion_address";
@ -40,7 +39,7 @@ mixin FusionInterface {
_generateAddressForChain = generateAddressForChain;
}
Future<Address> createNewReservedChangeAddress() async {
Future<cash_fusion.Address> createNewReservedChangeAddress() async {
int? highestChangeIndex = await _db
.getAddresses(_walletId)
.filter()
@ -62,7 +61,7 @@ mixin FusionInterface {
await _db.putAddress(address);
return address;
return address.toFusionAddress();
}
Future<List<Address>> getUnusedReservedChangeAddresses(
@ -104,8 +103,8 @@ mixin FusionInterface {
void fuse() async {
// Initial attempt for CashFusion integration goes here.
Fusion mainFusionObject =
Fusion(generateChangeAddress: () => _getNextChangeAddress());
Fusion mainFusionObject = Fusion(
createNewReservedChangeAddress: () => createNewReservedChangeAddress());
// add stack utxos
List<UTXO> utxos = await _db.getUTXOs(_walletId).findAll();
@ -113,19 +112,20 @@ mixin FusionInterface {
.map((e) => (txid: e.txid, vout: e.vout, value: e.value))
.toList());
// add stack change address
final String currentChangeAddress = await _getCurrentChangeAddress();
// cast from String to Address
final Address? changeAddress =
await _db.getAddress(_walletId, currentChangeAddress);
// cast from Stack's Address to Fusiondart's Address
final fusion_address.Address fusionChangeAddress =
changeAddress!.toFusionAddress();
await mainFusionObject.addChangeAddress(fusionChangeAddress);
Logging.instance.log(
"FusionInterface fuse() changeAddress: $changeAddress",
level: LogLevel.Info,
);
// TODO rework
// // add stack change address
// final String currentChangeAddress = await _getCurrentChangeAddress();
// // cast from String to Address
// final Address? changeAddress =
// await _db.getAddress(_walletId, currentChangeAddress);
// // cast from Stack's Address to Fusiondart's Address
// final fusion_address.Address fusionChangeAddress =
// changeAddress!.toFusionAddress();
// await mainFusionObject.addChangeAddress(fusionChangeAddress);
// Logging.instance.log(
// "FusionInterface fuse() changeAddress: $changeAddress",
// level: LogLevel.Info,
// );
// fuse utxos
await mainFusionObject.fusion_run();