Skip to content

Replaced custom parsing logic by Uri #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NicolasDorier merged 1 commit into from
May 18, 2023
Merged

Replaced custom parsing logic by Uri #1169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 12 additions & 25 deletions NBitcoin/Payment/BitcoinUrlBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -47,38 +47,25 @@ public BitcoinUrlBuilder(string uri, Network network)
throw new ArgumentNullException(nameof(uri));
if (network == null)
throw new ArgumentNullException(nameof(network));
scheme = network.UriScheme;
if (!uri.StartsWith($"{scheme}:", StringComparison.OrdinalIgnoreCase))
{
if (uri.StartsWith("bitcoin:", StringComparison.OrdinalIgnoreCase))
scheme = "bitcoin";
else
throw new FormatException("Invalid scheme");
}

var parsedUri = new Uri(uri, UriKind.Absolute);

scheme =
parsedUri.Scheme.Equals(network.UriScheme, StringComparison.OrdinalIgnoreCase) ? network.UriScheme :
parsedUri.Scheme.Equals("bitcoin", StringComparison.OrdinalIgnoreCase) ? "bitcoin" :
throw new FormatException("Invalid scheme");

Network = network;
uri = uri.Remove(0, $"{scheme}:".Length);
if (uri.StartsWith("//"))
uri = uri.Remove(0, 2);

var paramStart = uri.IndexOf('?');
string? address = null;
if (paramStart == -1)
address = uri;
else
{
address = uri.Substring(0, paramStart);
uri = uri.Remove(0, 1); //remove ?
}
if (address != String.Empty)

if (parsedUri.AbsolutePath is { Length: > 0 } address)
{
Address = Network.Parse<BitcoinAddress>(address, network);
}
uri = uri.Remove(0, address.Length);

Dictionary<string, string> parameters;
try
{
parameters = UriHelper.DecodeQueryParameters(uri);
parameters = UriHelper.DecodeQueryParameters(parsedUri.GetComponents(UriComponents.Query, UriFormat.UriEscaped));
}
catch (ArgumentException)
{
Expand Down