refactor bugfixes

michielpost · michielpost · commit be545f63f518 · 2024-04-28T15:01:07.000+02:00
diff --git a/src/aoWebWallet/Models/ActionParam.cs b/src/aoWebWallet/Models/ActionParam.cs
@@ -38,6 +38,11 @@ public class AoAction
             return AllWithoutTarget.Select(x => new ArweaveBlazor.Models.Tag { Name = x.Key, Value = x.Value ?? string.Empty }).ToList();
         }
 
+        public List<ArweaveAO.Models.Tag> ToDryRunTags()
+        {
+            return AllWithoutTarget.Select(x => new ArweaveAO.Models.Tag { Name = x.Key, Value = x.Value ?? string.Empty }).ToList();
+        }
+
 
         public string ToQueryString()
         {
diff --git a/src/aoWebWallet/Pages/ActionPage.razor b/src/aoWebWallet/Pages/ActionPage.razor
@@ -133,6 +133,7 @@
         Wallet? ownerWallet = BindingContext.WalletList.Data.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
 
         started = true;
+        await transactionService.DryRunAction(wallet, ownerWallet, AoAction);
         await transactionService.SendAction(wallet, ownerWallet, AoAction);
     }
 
diff --git a/src/aoWebWallet/Pages/Tokens.razor.cs b/src/aoWebWallet/Pages/Tokens.razor.cs
@@ -7,6 +7,7 @@ public partial class Tokens : MvvmComponentBase<MainViewModel>
         protected override void OnInitialized()
         {
             WatchCollection(dataService.TokenList);
+            WatchObject(dataService.TokenDataLoader);
 
             base.OnInitialized();
         }
diff --git a/src/aoWebWallet/Pages/WalletDetail.razor.cs b/src/aoWebWallet/Pages/WalletDetail.razor.cs
@@ -11,6 +11,7 @@ protected override void OnInitialized()
         {
             //WatchObject(dataService.TokenList);
             WatchObject(BindingContext.BalanceDataList);
+            WatchObject(dataService.TokenDataLoader);
             WatchCollection(dataService.TokenList);
             WatchCollection(BindingContext.BalanceDataList);
             WatchDataLoaderVM(MainViewModel.WalletList);
diff --git a/src/aoWebWallet/Services/StorageService.cs b/src/aoWebWallet/Services/StorageService.cs
@@ -36,7 +36,7 @@ private void AddSystemToken(List<Token> list, string tokenId)
         {
             var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault();
             if (existing != null)
-                return;
+               existing.IsSystemToken = true;
             else
                 list.Add(new Token { TokenId = tokenId, IsSystemToken = true });
         }
@@ -59,21 +59,22 @@ public async Task AddTokenId(string tokenId, bool isUserAdded = true, bool isVis
             await SaveTokenList(list);
         }
 
-        public async ValueTask<Token> AddToken(string tokenId, TokenData data, bool isUserAdded, bool isVisible = true)
+        public async ValueTask<Token> AddToken(string tokenId, TokenData data, bool isUserAdded, bool? isVisible)
         {
             var list = await GetTokenIds();
 
             var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault();
             if (existing != null)
             {
-                existing.IsVisible = true;
+                if(isVisible.HasValue)
+                    existing.IsVisible = isVisible.Value;
 
                 if(!existing.IsSystemToken)
                     existing.IsUserAdded = true;
             }
             else
             {
-                existing = new Token { TokenId = tokenId, TokenData = data, IsUserAdded = isUserAdded, IsVisible = isVisible };
+                existing = new Token { TokenId = tokenId, TokenData = data, IsUserAdded = isUserAdded, IsVisible = isVisible ?? true };
                 list.Add(existing);
             }
 
diff --git a/src/aoWebWallet/Services/TokenDataService.cs b/src/aoWebWallet/Services/TokenDataService.cs
@@ -38,30 +38,29 @@ public async Task TryAddTokenIds(List<string?> allTokenIds)
                 {
                     var data = await tokenClient.GetTokenMetaData(tokenId);
                     return data;
+                }, async data =>
+                {
+                    if (data != null)
+                    {
+                        await storageService.AddToken(tokenId, data, isUserAdded: false, null);
+
+                        await LoadTokenList();
+                    }
                 });
 
-                if (data != null)
-                {
-                    await storageService.AddToken(tokenId, data, isUserAdded: false);
-                }
+                
             }
-
-            await LoadTokenList();
         }
 
         public async Task<Token> LoadTokenAsync(string tokenId)
         {
-            var tokens = await storageService.GetTokenIds();
-
-            var token = tokens.Where(x => x.TokenId.Equals(tokenId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
+            var token = TokenList.Where(x => x.TokenId.Equals(tokenId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
             if(token == null)
             {
                 token = new Token()
                 { 
                     TokenId  = tokenId,
                 };
-
-                tokens.Add(token);
             }
 
             if (token.TokenData == null)
@@ -77,7 +76,9 @@ public async Task<Token> LoadTokenAsync(string tokenId)
 
                     token.TokenData = data;
 
-                    await storageService.SaveTokenList(tokens);
+                    TokenList.Add(token);
+
+                    await storageService.AddToken(tokenId, data, false, null);
                 }
                
             }
@@ -92,12 +93,15 @@ public async Task LoadTokenList(bool force = false)
                 TokenList.Clear();
                 await foreach (var item in LoadTokenDataAsync())
                 {
-                    TokenList.Add(item);
+                    var existing = TokenList.Where(x => x.TokenId == item.TokenId).Any();
+
+                    if(!existing)
+                        TokenList.Add(item);
                 }
             }
         }
 
-        public async IAsyncEnumerable<Token> LoadTokenDataAsync()
+        private async IAsyncEnumerable<Token> LoadTokenDataAsync()
         {
             var tokens = await storageService.GetTokenIds();
             foreach (var token in tokens)
@@ -144,20 +148,6 @@ public async Task TokenToggleVisibility(string tokenId)
             }
         }
 
-        public async Task AddToken(string tokenId, TokenData data, bool isUserAdded)
-        {
-            var newToken = await storageService.AddToken(tokenId, data, isUserAdded);
-            var existing = TokenList.Where(x => x.TokenId == newToken.TokenId).FirstOrDefault();
-            if (existing == null)
-            {
-                TokenList.Add(newToken);
-            }
-            else
-            {
-                existing = newToken;
-            }
-        }
-
         public async Task Clear()
         {
             await storageService.SaveTokenList(new());
diff --git a/src/aoWebWallet/Services/TransactionService.cs b/src/aoWebWallet/Services/TransactionService.cs
@@ -1,12 +1,13 @@
 ﻿using aoWebWallet.Extensions;
 using aoWebWallet.Models;
+using ArweaveAO.Requests;
 using ArweaveBlazor;
 using CommunityToolkit.Mvvm.ComponentModel;
 using webvNext.DataLoader;
 
 namespace aoWebWallet.Services
 {
-    public class TransactionService(ArweaveService arweaveService) : ObservableObject
+    public class TransactionService(ArweaveService arweaveService, ArweaveAO.AODataClient aODataClient) : ObservableObject
     {
         public void Reset()
         {
@@ -29,6 +30,19 @@ public void Reset()
             return null;
         }
 
+        public async Task DryRunAction(Wallet wallet, Wallet? ownerWallet, AoAction action)
+        {
+            var target = action.Target?.Value ?? string.Empty;
+            var druRunRequest = new DryRunRequest()
+            {
+                Target = target,
+                Tags = action.ToDryRunTags()
+            };
+
+            var result = aODataClient.DryRun(target, druRunRequest);
+
+        }
+
         public async Task SendAction(Wallet wallet, Wallet? ownerWallet, AoAction action)
         {
             if (wallet.Source == WalletTypes.ArConnect)
diff --git a/src/aoWebWallet/Shared/AddTokenDialog.razor b/src/aoWebWallet/Shared/AddTokenDialog.razor
@@ -40,8 +40,6 @@
             var data = token.TokenData;
             if (data != null)
             {
-                await dataService.AddToken(TokenId, data, isUserAdded: true);
-
                 Snackbar.Add($"Token added ({data.Name})", Severity.Info);
 
                 MudDialog.Close(DialogResult.Ok(true));
diff --git a/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor b/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor
@@ -81,6 +81,7 @@
 
     protected override async Task OnParametersSetAsync()
     {
+        BalanceData = null;
         var token = await tokenDataService.LoadTokenAsync(TokenId);
         if (token.TokenData?.Denomination != null)
             Token = token;

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ public class AoAction`
`38`	`38`	`return AllWithoutTarget.Select(x => new ArweaveBlazor.Models.Tag { Name = x.Key, Value = x.Value ?? string.Empty }).ToList();`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public List<ArweaveAO.Models.Tag> ToDryRunTags()`
	`42`	`+ {`
	`43`	`+ return AllWithoutTarget.Select(x => new ArweaveAO.Models.Tag { Name = x.Key, Value = x.Value ?? string.Empty }).ToList();`
	`44`	`+ }`
	`45`	`+`
`41`	`46`
`42`	`47`	`public string ToQueryString()`
`43`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@`
`133`	`133`	`Wallet? ownerWallet = BindingContext.WalletList.Data.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();`
`134`	`134`
`135`	`135`	`started = true;`
	`136`	`+ await transactionService.DryRunAction(wallet, ownerWallet, AoAction);`
`136`	`137`	`await transactionService.SendAction(wallet, ownerWallet, AoAction);`
`137`	`138`	`}`
`138`	`139`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public partial class Tokens : MvvmComponentBase<MainViewModel>`
`7`	`7`	`protected override void OnInitialized()`
`8`	`8`	`{`
`9`	`9`	`WatchCollection(dataService.TokenList);`
	`10`	`+ WatchObject(dataService.TokenDataLoader);`
`10`	`11`
`11`	`12`	`base.OnInitialized();`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ protected override void OnInitialized()`
`11`	`11`	`{`
`12`	`12`	`//WatchObject(dataService.TokenList);`
`13`	`13`	`WatchObject(BindingContext.BalanceDataList);`
	`14`	`+ WatchObject(dataService.TokenDataLoader);`
`14`	`15`	`WatchCollection(dataService.TokenList);`
`15`	`16`	`WatchCollection(BindingContext.BalanceDataList);`
`16`	`17`	`WatchDataLoaderVM(MainViewModel.WalletList);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ private void AddSystemToken(List<Token> list, string tokenId)`
`36`	`36`	`{`
`37`	`37`	`var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault();`
`38`	`38`	`if (existing != null)`
`39`		`- return;`
	`39`	`+ existing.IsSystemToken = true;`
`40`	`40`	`else`
`41`	`41`	`list.Add(new Token { TokenId = tokenId, IsSystemToken = true });`
`42`	`42`	`}`
`@@ -59,21 +59,22 @@ public async Task AddTokenId(string tokenId, bool isUserAdded = true, bool isVis`
`59`	`59`	`await SaveTokenList(list);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public async ValueTask<Token> AddToken(string tokenId, TokenData data, bool isUserAdded, bool isVisible = true)`
	`62`	`+ public async ValueTask<Token> AddToken(string tokenId, TokenData data, bool isUserAdded, bool? isVisible)`
`63`	`63`	`{`
`64`	`64`	`var list = await GetTokenIds();`
`65`	`65`
`66`	`66`	`var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault();`
`67`	`67`	`if (existing != null)`
`68`	`68`	`{`
`69`		`- existing.IsVisible = true;`
	`69`	`+ if(isVisible.HasValue)`
	`70`	`+ existing.IsVisible = isVisible.Value;`
`70`	`71`
`71`	`72`	`if(!existing.IsSystemToken)`
`72`	`73`	`existing.IsUserAdded = true;`
`73`	`74`	`}`
`74`	`75`	`else`
`75`	`76`	`{`
`76`		`- existing = new Token { TokenId = tokenId, TokenData = data, IsUserAdded = isUserAdded, IsVisible = isVisible };`
	`77`	`+ existing = new Token { TokenId = tokenId, TokenData = data, IsUserAdded = isUserAdded, IsVisible = isVisible ?? true };`
`77`	`78`	`list.Add(existing);`
`78`	`79`	`}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -38,30 +38,29 @@ public async Task TryAddTokenIds(List<string?> allTokenIds)`
`38`	`38`	`{`
`39`	`39`	`var data = await tokenClient.GetTokenMetaData(tokenId);`
`40`	`40`	`return data;`
	`41`	`+ }, async data =>`
	`42`	`+ {`
	`43`	`+ if (data != null)`
	`44`	`+ {`
	`45`	`+ await storageService.AddToken(tokenId, data, isUserAdded: false, null);`
	`46`	`+`
	`47`	`+ await LoadTokenList();`
	`48`	`+ }`
`41`	`49`	`});`
`42`	`50`
`43`		`- if (data != null)`
`44`		`- {`
`45`		`- await storageService.AddToken(tokenId, data, isUserAdded: false);`
`46`		`- }`
	`51`	`+`
`47`	`52`	`}`
`48`		`-`
`49`		`- await LoadTokenList();`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`public async Task<Token> LoadTokenAsync(string tokenId)`
`53`	`56`	`{`
`54`		`- var tokens = await storageService.GetTokenIds();`
`55`		`-`
`56`		`- var token = tokens.Where(x => x.TokenId.Equals(tokenId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();`
	`57`	`+ var token = TokenList.Where(x => x.TokenId.Equals(tokenId, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();`
`57`	`58`	`if(token == null)`
`58`	`59`	`{`
`59`	`60`	`token = new Token()`
`60`	`61`	`{`
`61`	`62`	`TokenId = tokenId,`
`62`	`63`	`};`
`63`		`-`
`64`		`- tokens.Add(token);`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`if (token.TokenData == null)`
`@@ -77,7 +76,9 @@ public async Task<Token> LoadTokenAsync(string tokenId)`
`77`	`76`
`78`	`77`	`token.TokenData = data;`
`79`	`78`
`80`		`- await storageService.SaveTokenList(tokens);`
	`79`	`+ TokenList.Add(token);`
	`80`	`+`
	`81`	`+ await storageService.AddToken(tokenId, data, false, null);`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`}`
`@@ -92,12 +93,15 @@ public async Task LoadTokenList(bool force = false)`
`92`	`93`	`TokenList.Clear();`
`93`	`94`	`await foreach (var item in LoadTokenDataAsync())`
`94`	`95`	`{`
`95`		`- TokenList.Add(item);`
	`96`	`+ var existing = TokenList.Where(x => x.TokenId == item.TokenId).Any();`
	`97`	`+`
	`98`	`+ if(!existing)`
	`99`	`+ TokenList.Add(item);`
`96`	`100`	`}`
`97`	`101`	`}`
`98`	`102`	`}`
`99`	`103`
`100`		`- public async IAsyncEnumerable<Token> LoadTokenDataAsync()`
	`104`	`+ private async IAsyncEnumerable<Token> LoadTokenDataAsync()`
`101`	`105`	`{`
`102`	`106`	`var tokens = await storageService.GetTokenIds();`
`103`	`107`	`foreach (var token in tokens)`
`@@ -144,20 +148,6 @@ public async Task TokenToggleVisibility(string tokenId)`
`144`	`148`	`}`
`145`	`149`	`}`
`146`	`150`
`147`		`- public async Task AddToken(string tokenId, TokenData data, bool isUserAdded)`
`148`		`- {`
`149`		`- var newToken = await storageService.AddToken(tokenId, data, isUserAdded);`
`150`		`- var existing = TokenList.Where(x => x.TokenId == newToken.TokenId).FirstOrDefault();`
`151`		`- if (existing == null)`
`152`		`- {`
`153`		`- TokenList.Add(newToken);`
`154`		`- }`
`155`		`- else`
`156`		`- {`
`157`		`- existing = newToken;`
`158`		`- }`
`159`		`- }`
`160`		`-`
`161`	`151`	`public async Task Clear()`
`162`	`152`	`{`
`163`	`153`	`await storageService.SaveTokenList(new());`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@`
`40`	`40`	`var data = token.TokenData;`
`41`	`41`	`if (data != null)`
`42`	`42`	`{`
`43`		`- await dataService.AddToken(TokenId, data, isUserAdded: true);`
`44`		`-`
`45`	`43`	`Snackbar.Add($"Token added ({data.Name})", Severity.Info);`
`46`	`44`
`47`	`45`	`MudDialog.Close(DialogResult.Ok(true));`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@`
`81`	`81`
`82`	`82`	`protected override async Task OnParametersSetAsync()`
`83`	`83`	`{`
	`84`	`+ BalanceData = null;`
`84`	`85`	`var token = await tokenDataService.LoadTokenAsync(TokenId);`
`85`	`86`	`if (token.TokenData?.Denomination != null)`
`86`	`87`	`Token = token;`