From 372f95af07a93aacaa349d0441f587ffa1ce4aed Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 27 Sep 2023 15:04:24 -0500 Subject: [PATCH] update fusiondart ref and integration --- fusiondart | 2 +- lib/services/mixins/fusion_wallet_interface.dart | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fusiondart b/fusiondart index 7e7c4f27b..22084e8a4 160000 --- a/fusiondart +++ b/fusiondart @@ -1 +1 @@ -Subproject commit 7e7c4f27ba8aececf813a6117eaba549edcb5f89 +Subproject commit 22084e8a4b39c282570645896a12332724f1cdbe diff --git a/lib/services/mixins/fusion_wallet_interface.dart b/lib/services/mixins/fusion_wallet_interface.dart index 8a8d6d511..9303997c7 100644 --- a/lib/services/mixins/fusion_wallet_interface.dart +++ b/lib/services/mixins/fusion_wallet_interface.dart @@ -207,19 +207,10 @@ mixin FusionWalletInterface { /// A `Future` that resolves when the fusion operation is finished. Future fuse() async { // Initial attempt for CashFusion integration goes here. - final mainFusionObject = Fusion( - getAddresses: () => getFusionAddresses(), - getTransactionsByAddress: (String address) => - getTransactionsByAddress(address), - getInputsByAddress: (String address) => getInputsByAddress(address), - // createNewReservedChangeAddress: () => createNewReservedChangeAddress(), - getUnusedReservedChangeAddresses: (int numberOfAddresses) => - getUnusedReservedChangeAddresses(numberOfAddresses), - getSocksProxyAddress: () => getSocksProxyAddress(), - ); + final mainFusionObject = Fusion(FusionParams()); // Pass wallet functions to the Fusion object - mainFusionObject.initFusion( + await mainFusionObject.initFusion( getAddresses: getFusionAddresses, getTransactionsByAddress: getTransactionsByAddress, getInputsByAddress: getInputsByAddress,