ETH 0x address support

Author: michielpost

src/aoWebWallet/Pages/ReceivePage.razor

@@ -171,7 +171,7 @@
 
     protected override async Task OnParametersSetAsync()
     {
-        if (Address != null && Address.Length != 43)
+        if (Address != null && !AddressValidator.IsValidAddress(Address))
         {
             NavigationManager.NavigateTo("");
         }

src/aoWebWallet/Pages/ScanQrPage.razor

@@ -53,7 +53,7 @@
             return;
         }
 
-        var address = code.Substring(3, 43);
+        var address = code.Substring(3).Trim();
 
         int tokenStart = code.IndexOf("?tokenId=");
         if (tokenStart > 0)

src/aoWebWallet/Pages/WalletDetail.razor.cs

@@ -1,5 +1,6 @@
 using aoWebWallet.Models;
 using aoWebWallet.ViewModels;
+using ArweaveAO;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 
@@ -40,7 +41,7 @@ private async void TokenList_CollectionChanged(object? sender, System.Collection
 
         protected override async Task OnParametersSetAsync()
         {
-            if (Address != null && Address.Length != 43)
+            if (Address != null && !AddressValidator.IsValidAddress(Address))
             {
                 NavigationManager.NavigateTo("");
             }

src/aoWebWallet/Shared/AddTokenDialog.razor

@@ -5,7 +5,7 @@
     <DialogContent>
         Add a token to view your balance. Provide a process-id that implements the token standard.
         <MudFocusTrap DefaultFocus="DefaultFocus.FirstChild">
-            <MudTextField @bind-Value="TokenId" Label="Token Id" Mask="@(new RegexMask("^[a-zA-Z0-9_\\-]{0,43}$"))" MaxLength="43" Variant="Variant.Text"></MudTextField>
+            <MudTextField @bind-Value="TokenId" Label="Token Id" MaxLength="43" Variant="Variant.Text"></MudTextField>
         </MudFocusTrap>
         <MudText Color="Color.Secondary">@Progress</MudText>
     </DialogContent>
@@ -27,7 +27,7 @@
             Progress = "Input the process-id of an ao-process implementing the token standard.";
             return;
         }
-        if(TokenId.Length != 43)
+        if (!AddressValidator.IsValidArweaveAddress(TokenId))
         {
             Progress = "Length must be 43 characters.";
             return;

src/aoWebWallet/Shared/AddTokenToWalletDialog.razor

@@ -6,7 +6,7 @@
     <DialogContent>
         Add a token to view your balance. Provide a process-id that implements the token standard.
         <MudFocusTrap DefaultFocus="DefaultFocus.FirstChild">
-            <MudTextField @bind-Value="TokenId" Label="Token Id" Mask="@(new RegexMask("^[a-zA-Z0-9_\\-]{0,43}$"))" MaxLength="43" Variant="Variant.Text"></MudTextField>
+            <MudTextField @bind-Value="TokenId" Label="Token Id" MaxLength="43" Variant="Variant.Text"></MudTextField>
         </MudFocusTrap>
         <MudText Color="Color.Secondary">@Progress</MudText>
     </DialogContent>
@@ -28,7 +28,7 @@
             Progress = "Input the process-id of an ao-process implementing the token standard.";
             return;
         }
-        if(TokenId.Length != 43)
+        if (!AddressValidator.IsValidArweaveAddress(TokenId))
         {
             Progress = "Length must be 43 characters.";
             return;

src/aoWebWallet/Shared/Components/ActionInputComponent.razor

@@ -146,9 +146,9 @@ else
 
     public IEnumerable<string> ValidateProcess(Wallet? input)
     {
-        if (input == null || input.Address.Length != 43)
+        if (input == null || !AddressValidator.IsValidAddress(input.Address))
         {
-            yield return "Address must have length of 43 characters.";
+            yield return "Invalid address.";
         }
     }
 
@@ -179,7 +179,7 @@ else
 
         if (contacts.Any())
             return contacts;
-        else if(value.Length == 43)
+        else if (AddressValidator.IsValidAddress(value))
             return new Wallet[1] { new Wallet() { Address = value } };
         else
             return new Wallet[0];

src/aoWebWallet/Shared/EditWalletComponent.razor

@@ -4,7 +4,7 @@
 
 <MudPaper Class="pa-8">
     <MudStack Spacing="2">
-        <MudTextField @bind-Value="Address" ReadOnly="@IsReadOnly" Required="true" RequiredError="Input a wallet address" Mask="@(new RegexMask("^[a-zA-Z0-9_\\-]{0,43}$"))" Label="Wallet Address" Variant="Variant.Text"></MudTextField>
+        <MudTextField @bind-Value="Address" ReadOnly="@IsReadOnly" Required="true" RequiredError="Input a wallet address" Label="Wallet Address" Variant="Variant.Text"></MudTextField>
         <MudText Color="Color.Secondary">@Progress</MudText>
         <MudTextField @bind-Value="Name" Label="Wallet Name" Variant="Variant.Text"></MudTextField>
 
@@ -54,9 +54,9 @@
         //     return false;
         // }
 
-        if (string.IsNullOrWhiteSpace(Address) || Address.Length != 43)
+        if (string.IsNullOrWhiteSpace(Address) || !AddressValidator.IsValidAddress(Address))
         {
-            Progress = "Length must be 43 characters.";
+            Progress = "Provide a valid Arweave or Ethereum address.";
             StateHasChanged();
             return false;
         }

src/aoWebWallet/aoWebWallet.csproj

@@ -12,8 +12,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.6" />
-		<PackageReference Include="ArweaveBlazor" Version="0.0.9" />
+		<PackageReference Include="ArweaveAO" Version="0.0.7" />
+		<PackageReference Include="ArweaveBlazor" Version="0.0.10" />
 		<PackageReference Include="ClipLazor" Version="2.1.1" />
 		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.1" />
 		<PackageReference Include="MudBlazor" Version="7.6.0" />

src/aoww.ProcesModels/aoww.ProcesModels.csproj

@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.6" />
+		<PackageReference Include="ArweaveAO" Version="0.0.7" />
 	</ItemGroup>
 
 </Project>