Using ao proxy process for balance

michielpost · Jun 29, 2024 · 1bd7ea6 · 1bd7ea6
1 parent 8e0e3c7
commit 1bd7ea6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/src/aoWebWallet/Constants.cs b/src/aoWebWallet/Constants.cs
@@ -3,6 +3,7 @@
     public static class Constants
     {
         public static string AoTokenId => "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w";
+        public static string AoProxyTokenId => "Pi-WmAQp2-mh-oWH9lWpz5EthlUDj_W0IusAv-RXhRk";
         public static string CredTokenId => "Sa0iBLPNyJQrwpTTG-tWLQU-1QeUAJA73DdxGGiKoJc";
     }
 }
diff --git a/src/aoWebWallet/Models/Token.cs b/src/aoWebWallet/Models/Token.cs
@@ -5,6 +5,7 @@ namespace aoWebWallet.Models
     public class Token
     {
         public required string TokenId { get; set; }
+        public string? ProxyTokenId { get; set; }
         public bool IsSystemToken { get; set; }
         public bool IsUserAdded { get; set; }
         public bool IsVisible { get; set; } = true;

diff --git a/src/aoWebWallet/Services/StorageService.cs b/src/aoWebWallet/Services/StorageService.cs
@@ -66,7 +66,8 @@ public static void AddSystemTokens(List<Token> result)
                     Logo = "UkS-mdoiG8hcAClhKK8ch4ZhEzla0mCPDOix9hpdSFE",
                     Name = "AO",
                     Ticker = "AO"
-                }); //AO
+                },
+                proxyTokenId:Constants.AoProxyTokenId); //AO
 
             AddSystemToken(result, Constants.CredTokenId,
                new TokenData
@@ -160,13 +161,17 @@ public static void AddSystemTokens(List<Token> result)
                });
         }
 
-        private static void AddSystemToken(List<Token> list, string tokenId, TokenData tokenData)
+        private static void AddSystemToken(List<Token> list, string tokenId, TokenData tokenData, string? proxyTokenId = null)
         {
             var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault();
             if (existing != null)
-               existing.IsSystemToken = true;
+            {
+                existing.IsSystemToken = true;
+                existing.TokenData = tokenData;
+                existing.ProxyTokenId = proxyTokenId;
+            }
             else
-                list.Add(new Token { TokenId = tokenId, IsSystemToken = true, TokenData = tokenData });
+                list.Add(new Token { TokenId = tokenId, ProxyTokenId = proxyTokenId, IsSystemToken = true, TokenData = tokenData });
         }
 
         public async ValueTask<Token> AddToken(string tokenId, TokenData data, bool isUserAdded, bool? isVisible)

diff --git a/src/aoWebWallet/ViewModels/BalanceDataViewModel.cs b/src/aoWebWallet/ViewModels/BalanceDataViewModel.cs
@@ -11,17 +11,5 @@ public class BalanceDataViewModel
 
         public required string Address { get; set; }
 
-        //public void Load()
-        //{
-        //    BalanceDataLoader.DataLoader.LoadAsync(async () =>
-        //    {
-        //        var balanceData = await tokenClient.GetBalance(token.TokenId, address);
-        //        return balanceData;
-        //    }, (x) =>
-        //    {
-        //        balanceData.BalanceDataLoader.Data = x;
-        //        TokenTransferList.ForcePropertyChanged();
-        //    });
-        //}
     }
 }
diff --git a/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs b/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs
@@ -282,7 +282,11 @@ private async Task LoadBalanceDataList(string address, bool onlyNew = false)
 
                 balanceData.BalanceDataLoader.DataLoader.LoadAsync(async () =>
                 {
-                    var balanceData = await tokenClient.GetBalance(token.TokenId, address);
+                    var tokenForBalance = token.ProxyTokenId;
+                    if(string.IsNullOrEmpty(tokenForBalance))
+                        tokenForBalance = token.TokenId;
+
+                    var balanceData = await tokenClient.GetBalance(tokenForBalance, address);
                     return balanceData;
                 }, (x) =>
                 {

diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.5" />
+		<PackageReference Include="ArweaveAO" Version="0.0.6" />
 		<PackageReference Include="ArweaveBlazor" Version="0.0.9" />
 		<PackageReference Include="ClipLazor" Version="2.1.1" />
 		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="6.9.2" />

diff --git a/src/aoww.ProcesModels/aoww.ProcesModels.csproj b/src/aoww.ProcesModels/aoww.ProcesModels.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.5" />
+		<PackageReference Include="ArweaveAO" Version="0.0.6" />
 	</ItemGroup>
 
 </Project>