Backend,scripts: remove nested segwit code

Remove NATIVE_SEGWIT compile-time constant and all code that was disabled when NATIVE_SEGWIT was defined. Also remove readonly accounts migration to native segwit.
nblockchain · Jul 24, 2024 · 600cccf · 600cccf
1 parent bc88cdc
commit 600cccf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 54 deletions.
diff --git a/scripts/configure.fsx b/scripts/configure.fsx
@@ -211,16 +211,11 @@ let configFileToBeWritten =
         | Some theTool -> initialConfigFile.Add("LegacyBuildTool", theTool)
         | None -> initialConfigFile
 
-    let configFileStageThree =
+    let finalConfigFile =
         match buildTool with
         | Some theTool -> configFileStageTwo.Add("BuildTool", theTool)
         | None -> configFileStageTwo
 
-    let finalConfigFile =
-        // native segwit is enabled by default
-        configFileStageThree
-        |> AddToDefinedConstants "NATIVE_SEGWIT"
-
     finalConfigFile
 
 let lines =

diff --git a/src/GWallet.Backend/Account.fs b/src/GWallet.Backend/Account.fs
@@ -17,19 +17,8 @@ type UnhandledCurrencyServerException(currency: Currency,
 
 module Account =
 
-    let private isInitialized (accounts: seq<IAccount>) = lazy(
+    let private isInitialized (_accounts: seq<IAccount>) = lazy(
         Config.Init()
-
-#if !NATIVE_SEGWIT
-        let _readonlyUtxoAccounts =
-#else
-        let readonlyUtxoAccounts =
-#endif
-            accounts.Where(fun acc -> acc.Currency.IsUtxo()).OfType<ReadOnlyAccount>()
-#if NATIVE_SEGWIT
-        UtxoCoin.Account.MigrateReadOnlyAccountsToNativeSegWit readonlyUtxoAccounts
-#endif
-        ()
     )
 
     let private GetShowableBalanceAndImminentPaymentInternal (account: IAccount)

diff --git a/src/GWallet.Backend/Config.fs b/src/GWallet.Backend/Config.fs
@@ -38,11 +38,7 @@ module Config =
     let internal NoNetworkBalanceForDebuggingPurposes = false
 
     let internal UseNativeSegwit =
-#if NATIVE_SEGWIT
         true
-#else
-        false
-#endif
 
     let IsWindowsPlatform() =
         RuntimeInformation.IsOSPlatform OSPlatform.Windows

diff --git a/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs b/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs
@@ -700,38 +700,6 @@ module Account =
             Config.AddAccount conceptAccountForReadOnlyAccount AccountKind.ReadOnly
             |> ignore<FileRepresentation>
 
-#if NATIVE_SEGWIT
-    let internal MigrateReadOnlyAccountsToNativeSegWit (readOnlyUtxoAccounts: seq<ReadOnlyAccount>): unit =
-        let utxoAccountsToMigrate =
-            seq {
-                for utxoAccount in readOnlyUtxoAccounts do
-                    let accountFile = utxoAccount.AccountFile
-                    let prefix =
-                        match (utxoAccount :> IAccount).Currency with
-                        | Currency.BTC ->
-                            BITCOIN_ADDRESS_BECH32_PREFIX
-                        | Currency.LTC ->
-                            LITECOIN_ADDRESS_BECH32_PREFIX
-                        | otherCurrency -> failwith <| SPrintF1 "Missed UTXO currency %A when implementing NativeSegwit migration?" otherCurrency
-                    if not (accountFile.Name.StartsWith prefix) then
-                        yield utxoAccount
-            }
-
-        let utxoPublicKeys =
-            seq {
-                for utxoReadOnlyAccount in utxoAccountsToMigrate do
-                    let accountFile = utxoReadOnlyAccount.AccountFile
-                    let utxoPublicKey = accountFile.Content()
-                    yield utxoPublicKey
-            } |> Set.ofSeq
-
-        for utxoPublicKey in utxoPublicKeys do
-            CreateReadOnlyAccounts utxoPublicKey
-
-        for utxoReadOnlyAccount in utxoAccountsToMigrate do
-            Config.RemoveReadOnlyAccount utxoReadOnlyAccount
-#endif
-
     let GetSignedTransactionDetails<'T when 'T :> IBlockchainFeeInfo>(rawTransaction: string)
                                                                      (currency: Currency)
                                                                      (readonlyUtxoAccounts: seq<ReadOnlyUtxoAccount>)