WIP: trying to make CI green

nblockchain · Jul 17, 2024 · 8af58c9 · 8af58c9
1 parent 2a860f1
commit 8af58c9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/src/GWallet.Backend/AccountTypes.fs b/src/GWallet.Backend/AccountTypes.fs
@@ -2,9 +2,11 @@ namespace GWallet.Backend
 
 open System.IO
 
+type UtxoPublicKey = string
+
 type WatchWalletInfo =
     {
-        UtxoCoinPublicKey: string
+        UtxoCoinPublicKey: UtxoPublicKey
         EtherPublicAddress: string
     }
 

diff --git a/src/GWallet.Backend/UtxoCoin/ImportedAccount.fs b/src/GWallet.Backend/UtxoCoin/ImportedAccount.fs
@@ -7,31 +7,29 @@ open NBitcoin
 type ImportedAccount(mnemonic: string) =
     let rootKey = Mnemonic(mnemonic).DeriveExtKey().Derive(KeyPath("m/84'/0'/0'"))
     let firstReceivingAddressKey = rootKey.Derive(0u).Derive(0u)
-    let firstReceivingAddressPubKey = firstReceivingAddressKey.GetPublicKey()
+    let firstReceivingAddressPubKey = firstReceivingAddressKey.GetPublicKey().ToHex()
+    let publicAddress = firstReceivingAddressKey.GetPublicKey().GetAddress(ScriptPubKeyType.Segwit, Network.Main).ToString()
+
+    do ignore firstReceivingAddressPubKey
 
     interface IAccount with
         member self.Currency = Currency.BTC
-        member self.PublicAddress = firstReceivingAddressPubKey.GetAddress(ScriptPubKeyType.Segwit, Network.Main).ToString()
-
-    member private self.AsIUtxoAccount =
-        { new IUtxoAccount with
-            member self.Currency = (self :> IAccount).Currency
-            member self.PublicAddress = (self :> IAccount).PublicAddress
-            member self.PublicKey = firstReceivingAddressPubKey }
-
+        member self.PublicAddress = publicAddress
+#if !LEGACY_FRAMEWORK   
     member self.GetTotalBalance() =
         async {
             let! maybeBalance = 
                 Account.GetShowableBalanceAndImminentIncomingPayment 
-                    self.AsIUtxoAccount
+                    (Account.GetIUtxoAccount self firstReceivingAddressPubKey)
                     ServerSelectionMode.Fast 
                     None
             return maybeBalance |> Option.map (fun (balance, _) -> balance)
         }
 
     member self.SendFunds (destinationAccount: IAccount) (amount: TransferAmount) =
         Account.SendPaymentFromImportedAccount 
-            self.AsIUtxoAccount
+            (Account.GetIUtxoAccount self firstReceivingAddressPubKey)
             destinationAccount.PublicAddress 
             amount 
             firstReceivingAddressKey.PrivateKey
+#endif
diff --git a/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs b/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs
@@ -535,6 +535,12 @@ module Account =
         let finalTransaction = SignTransaction account txMetadata destination amount password
         BroadcastRawTransaction baseAccount.Currency finalTransaction ignoreHigherMinerFeeThanAmount
 
+    let internal GetIUtxoAccount (account: IAccount) (publicKey: UtxoPublicKey) =
+        { new IUtxoAccount with
+            member self.Currency = account.Currency
+            member self.PublicAddress = account.PublicAddress
+            member self.PublicKey = PubKey(publicKey) }
+
     let internal SendPaymentFromImportedAccount (account: IUtxoAccount)
                                                 (destination: string)
                                                 (amount: TransferAmount)

diff --git a/src/GWallet.Frontend.Console/Program.fs b/src/GWallet.Frontend.Console/Program.fs
@@ -351,6 +351,7 @@ module Program =
             ()
 
     let TransferFundsFromWalletUsingMenmonic() =
+#if !LEGACY_FRAMEWORK
         let rec askForMnemonic() : UtxoCoin.ImportedAccount =
             Console.WriteLine "Enter mnemonic seed phrase (12, 15, 18, 21 or 24 words):"
             let mnemonic = Console.ReadLine()
@@ -408,6 +409,10 @@ module Program =
                     let uri = BlockExplorer.GetTransaction currency txId
                     printfn "Transaction successful:\n%s" (uri.ToString())
             | None -> ()
+#else
+            let x = UtxoCoin.ImportedAccount ""
+            ignore x
+#endif
 
     let WalletOptions(): unit =
         let rec AskWalletOption(): GenericWalletOption =