Backend: upgrade NBitcoin to version 7.0.13

Updated NBitcoin to version 7.0.13 because older NBitcoin versions can't decode bech32 strings of length > 90, which is needed for Silent Payment address decoding. Use property UnknownParameters of BitcoinUrlBuilder as UnknowParameters is deprecated. Had to change some code since return type of new property is different.
nblockchain · Jul 15, 2024 · 9d3c534 · 9d3c534
1 parent 3af561c
commit 9d3c534
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 16 deletions.
diff --git a/src/GWallet.Backend.Tests/GWallet.Backend.Tests-legacy.fsproj b/src/GWallet.Backend.Tests/GWallet.Backend.Tests-legacy.fsproj
@@ -124,7 +124,7 @@
       <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\net461\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.0\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime">
       <HintPath>..\..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>

diff --git a/src/GWallet.Backend.Tests/packages.config b/src/GWallet.Backend.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="FSharp.Core" version="4.7.0" targetFramework="net461" />
   <package id="Fsdk" version="0.6.0--date20230530-1155.git-3bb8d08" targetFramework="net46" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net46" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="net471" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="net471" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net46" />
   <package id="NUnit" version="2.6.4" targetFramework="net46" />

diff --git a/src/GWallet.Backend/GWallet.Backend-legacy.fsproj b/src/GWallet.Backend/GWallet.Backend-legacy.fsproj
@@ -173,7 +173,7 @@
       <HintPath>..\..\packages\NBitcoin.Altcoins.3.0.8\lib\net452\NBitcoin.Altcoins.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\net461\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.0\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions">
       <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>

diff --git a/src/GWallet.Backend/GWallet.Backend.fsproj b/src/GWallet.Backend/GWallet.Backend.fsproj
@@ -62,7 +62,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2">
       <GeneratePathProperty></GeneratePathProperty>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="6.0.17">
+    <PackageReference Include="NBitcoin" Version="7.0.13">
       <GeneratePathProperty></GeneratePathProperty>
     </PackageReference>
     <PackageReference Include="NBitcoin.Altcoins" Version="3.0.8">

diff --git a/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs b/src/GWallet.Backend/UtxoCoin/UtxoCoinAccount.fs
@@ -580,8 +580,10 @@ module Account =
             }
         }
 
-    let MaybeReportWarningsForUnknownParameters addressOrUrl (unknownParams: System.Collections.Generic.Dictionary<string, string>) =
+    let MaybeReportWarningsForUnknownParameters addressOrUrl (unknownParams: System.Collections.Generic.IReadOnlyDictionary<string, string>) =
         if not (isNull unknownParams) && unknownParams.Any() then
+            // convert unknownParams to mutable dictionary since we may have to remove keys from it
+            let unknownParams = dict <| seq { for key in unknownParams.Keys -> key, unknownParams.[key] }
 
             let unknownToUs =
 
@@ -607,8 +609,7 @@ module Account =
         if addressOrUrl.StartsWith "bitcoin:" || addressOrUrl.StartsWith "litecoin:" then
             let uriBuilder = BitcoinUrlBuilder (addressOrUrl, network)
 
-            // FIXME: fix typo "UnknowParameters" in NBitcoin
-            MaybeReportWarningsForUnknownParameters addressOrUrl uriBuilder.UnknowParameters
+            MaybeReportWarningsForUnknownParameters addressOrUrl uriBuilder.UnknownParameters
 
             if null = uriBuilder.Address then
                 failwith <| SPrintF1 "Address started with 'bitcoin:' but an address could not be extracted: %s" addressOrUrl

diff --git a/src/GWallet.Backend/packages.config b/src/GWallet.Backend/packages.config
@@ -12,7 +12,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net46" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net46" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="net471" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="net471" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="net452" />
   <package id="Nethereum" version="0.99.0--date20240303-0535.git-f0bc8be" targetFramework="net471" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net471" />

diff --git a/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj b/src/GWallet.Frontend.XF.Android/GWallet.Frontend.XF.Android.fsproj
@@ -296,7 +296,7 @@
       <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.2\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\netstandard2.1\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.1\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin.Altcoins">
       <HintPath>..\..\packages\NBitcoin.Altcoins.3.0.8\lib\netstandard2.1\NBitcoin.Altcoins.dll</HintPath>

diff --git a/src/GWallet.Frontend.XF.Android/packages.config b/src/GWallet.Frontend.XF.Android/packages.config
@@ -13,7 +13,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="monoandroid90" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid90" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="monoandroid90" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="monoandroid90" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="monoandroid90" />
   <package id="Nethereum" version="0.99.0--date20240303-0535.git-f0bc8be" targetFramework="monoandroid90" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />

diff --git a/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj b/src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj
@@ -105,7 +105,7 @@
       <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\net461\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.0\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin.Altcoins">
       <HintPath>..\..\packages\NBitcoin.Altcoins.3.0.8\lib\net452\NBitcoin.Altcoins.dll</HintPath>

diff --git a/src/GWallet.Frontend.XF.Gtk/packages.config b/src/GWallet.Frontend.XF.Gtk/packages.config
@@ -11,7 +11,7 @@
   <package id="JsonRpcSharp" version="0.99.0--date20240303-0338.git-d673848" targetFramework="net471" />
   <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net471" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="net461" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="net471" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="net471" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="net471" />
   <package id="Nethereum" version="0.99.0--date20240303-0535.git-f0bc8be" targetFramework="net471" />
   <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net461" />

diff --git a/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj b/src/GWallet.Frontend.XF.Mac/GWallet.Frontend.XF.Mac.fsproj
@@ -84,7 +84,7 @@
       <HintPath>..\..\packages\System.Buffers.4.5.1\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\netstandard2.1\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.1\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin.Altcoins">
       <HintPath>..\..\packages\NBitcoin.Altcoins.3.0.8\lib\netstandard2.1\NBitcoin.Altcoins.dll</HintPath>

diff --git a/src/GWallet.Frontend.XF.Mac/packages.config b/src/GWallet.Frontend.XF.Mac/packages.config
@@ -11,7 +11,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="xamarinmac20" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinmac20" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinmac20" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="xamarinmac20" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="xamarinmac20" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="xamarinmac20" />
   <package id="Nethereum" version="0.99.0--date20240303-0535.git-f0bc8be" targetFramework="xamarinmac20" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinmac20" />

diff --git a/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj b/src/GWallet.Frontend.XF.iOS/GWallet.Frontend.XF.iOS.fsproj
@@ -198,7 +198,7 @@
       <HintPath>..\..\packages\System.Buffers.4.5.1\lib\netstandard2.0\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin">
-      <HintPath>..\..\packages\NBitcoin.6.0.17\lib\netstandard2.1\NBitcoin.dll</HintPath>
+      <HintPath>..\..\packages\NBitcoin.7.0.13\lib\netstandard2.1\NBitcoin.dll</HintPath>
     </Reference>
     <Reference Include="NBitcoin.Altcoins">
       <HintPath>..\..\packages\NBitcoin.Altcoins.3.0.8\lib\netstandard2.1\NBitcoin.Altcoins.dll</HintPath>

diff --git a/src/GWallet.Frontend.XF.iOS/packages.config b/src/GWallet.Frontend.XF.iOS/packages.config
@@ -12,7 +12,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.2" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
-  <package id="NBitcoin" version="6.0.17" targetFramework="xamarinios10" />
+  <package id="NBitcoin" version="7.0.13" targetFramework="xamarinios10" />
   <package id="NBitcoin.Altcoins" version="3.0.8" targetFramework="xamarinios10" />
   <package id="Nethereum" version="0.99.0--date20240303-0535.git-f0bc8be" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />