Merge branch 'master' into feature/milestone-01

# Conflicts: # src/aoWebWallet/Services/DataService.cs # src/aoWebWallet/ViewModels/MainViewModel.cs
michielpost · May 9, 2024 · 8e87799 · 8e87799
2 parents 8c9154c + bcbb5d5
commit 8e87799
Show file tree

Hide file tree

Showing 21 changed files with 191 additions and 29 deletions.
diff --git a/src/aoWebWallet.sln b/src/aoWebWallet.sln
@@ -9,6 +9,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{06E5BC39-7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "webvNext.DataLoader", "webvNext.DataLoader\webvNext.DataLoader.csproj", "{17CA4374-64D0-4618-852F-8A76D0A57166}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aoww.Services", "aoww.Services\aoww.Services.csproj", "{178C3213-D574-4B39-A2DA-1FB1D2806242}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{89AC47DF-65AD-4870-AA1D-74ABF1F3D8FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aoww.Services.Tests", "aoww.Services.Tests\aoww.Services.Tests.csproj", "{322F4807-05CF-431D-B400-7420E1B29936}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,12 +29,21 @@ Global
 		{17CA4374-64D0-4618-852F-8A76D0A57166}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17CA4374-64D0-4618-852F-8A76D0A57166}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17CA4374-64D0-4618-852F-8A76D0A57166}.Release|Any CPU.Build.0 = Release|Any CPU
+		{178C3213-D574-4B39-A2DA-1FB1D2806242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{178C3213-D574-4B39-A2DA-1FB1D2806242}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{178C3213-D574-4B39-A2DA-1FB1D2806242}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{178C3213-D574-4B39-A2DA-1FB1D2806242}.Release|Any CPU.Build.0 = Release|Any CPU
+		{322F4807-05CF-431D-B400-7420E1B29936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{322F4807-05CF-431D-B400-7420E1B29936}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{322F4807-05CF-431D-B400-7420E1B29936}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{322F4807-05CF-431D-B400-7420E1B29936}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{17CA4374-64D0-4618-852F-8A76D0A57166} = {06E5BC39-764A-48B9-B4F9-F48387A2C965}
+		{322F4807-05CF-431D-B400-7420E1B29936} = {89AC47DF-65AD-4870-AA1D-74ABF1F3D8FE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {432E3F8E-53FF-4D9C-869D-48449BD3B8B4}

diff --git a/src/aoWebWallet/Layout/MainLayout.razor b/src/aoWebWallet/Layout/MainLayout.razor
@@ -15,7 +15,7 @@
             Width="100" Class="pt-2" Alt="AOWW"/>
         </MudLink>
         <MudSpacer />
-        <MudIconButton title="menu" Icon="@Icons.Material.Filled.Workspaces" Color="MudBlazor.Color.Inherit" Edge="Edge.Start" OnClick="@((e) => DrawerToggle())" />
+        <MudIconButton title="menu" Icon="@Icons.Material.Filled.Workspaces" Color="MudBlazor.Color.Inherit" Edge="MudBlazor.Edge.Start" OnClick="@((e) => DrawerToggle())" />
         @*<MudText Typo="Typo.h5" Class="ml-3">aoWebWallet</MudText>*@
         @*<MudIconButton Icon="@Icons.Material.Filled.MoreVert" Color="Color.Inherit" Edge="Edge.End" />*@
         @* <ApiConnectionDisplay />*@

diff --git a/src/aoWebWallet/Program.cs b/src/aoWebWallet/Program.cs
@@ -11,6 +11,7 @@
 using ArweaveBlazor;
 using System.Globalization;
 using ClipLazor.Extention;
+using aoww.Services;
 
 namespace aoWebWallet
 {

diff --git a/src/aoWebWallet/Shared/Components/TransactionComponent.razor b/src/aoWebWallet/Shared/Components/TransactionComponent.razor
@@ -1,4 +1,5 @@
 @using aoWebWallet.Models
+
 @inherits MvvmComponentBase<MainViewModel>
 @inject TokenDataService dataService
 
@@ -47,7 +48,15 @@
             else if(isReceive)
             {
                 <MudText Typo="Typo.h6" style="color:green">+ @BalanceHelper.FormatBalance(transfer.Quantity, tokenData?.Denomination ?? 0)</MudText>
-                <MudIcon Icon="@Icons.Material.Filled.South" aria-label="Receive"></MudIcon>
+
+                @if(transfer.TokenTransferType == aoww.Services.Enums.TokenTransferType.Mint)
+                {
+                    <MudText Typo="Typo.h6" style="color:green">MINT</MudText>
+                }
+                else
+                {
+                    <MudIcon Icon="@Icons.Material.Filled.South" aria-label="Receive"></MudIcon>
+                }
                 <MudLink Class="KodeMono tx-wrap" Href="@detailUrlFrom" Typo="Typo.h6">
                     @transfer.From
                 </MudLink>

diff --git a/src/aoWebWallet/ViewModels/MainViewModel.cs b/src/aoWebWallet/ViewModels/MainViewModel.cs
@@ -2,6 +2,8 @@
 using aoWebWallet.Models;
 using aoWebWallet.Pages;
 using aoWebWallet.Services;
+using aoww.Services;
+using aoww.Services.Models;
 using ArweaveAO;
 using ArweaveAO.Models.Token;
 using ArweaveBlazor;

diff --git a/src/aoWebWallet/ViewModels/TokenDetailViewModel.cs b/src/aoWebWallet/ViewModels/TokenDetailViewModel.cs
@@ -1,5 +1,7 @@
 using aoWebWallet.Models;
 using aoWebWallet.Services;
+using aoww.Services;
+using aoww.Services.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using webvNext.DataLoader;
 using static MudBlazor.Colors;

diff --git a/src/aoWebWallet/ViewModels/TransactionDetailViewModel.cs b/src/aoWebWallet/ViewModels/TransactionDetailViewModel.cs
@@ -1,5 +1,7 @@
 using aoWebWallet.Models;
 using aoWebWallet.Services;
+using aoww.Services;
+using aoww.Services.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using webvNext.DataLoader;
 

diff --git a/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs b/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs
@@ -1,5 +1,7 @@
 using aoWebWallet.Models;
 using aoWebWallet.Services;
+using aoww.Services;
+using aoww.Services.Models;
 using ArweaveAO;
 using ArweaveBlazor;
 using CommunityToolkit.Mvvm.ComponentModel;

diff --git a/src/aoWebWallet/ViewModels/WalletProcessDataViewModel.cs b/src/aoWebWallet/ViewModels/WalletProcessDataViewModel.cs
@@ -1,4 +1,4 @@
-using aoWebWallet.Models;
+using aoww.Services.Models;
 using ArweaveAO.Models.Token;
 
 namespace aoWebWallet.ViewModels

diff --git a/src/aoWebWallet/_Imports.razor b/src/aoWebWallet/_Imports.razor
@@ -18,4 +18,5 @@
 @using webvNext.DataLoader
 @using ArweaveAO
 @using ArweaveBlazor
-@using aoWebWallet.Extensions
+@using aoWebWallet.Extensions
+@using aoww.Services.Models
diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
@@ -24,6 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <ProjectReference Include="..\aoww.Services\aoww.Services.csproj" />
 	  <ProjectReference Include="..\webvNext.DataLoader\webvNext.DataLoader.csproj" />
 	</ItemGroup>
 

diff --git a/src/aoww.Services.Tests/GraphqlTests.cs b/src/aoww.Services.Tests/GraphqlTests.cs
@@ -0,0 +1,26 @@
+namespace aoww.Services.Tests
+{
+    [TestClass]
+    public class GraphqlTests
+    {
+        [TestMethod]
+        public async Task GetTransactionsTest()
+        {
+            var graph = new GraphqlClient(new HttpClient());
+
+            var result = await graph.GetTransactionsIn("4NdFkWsgFQIEmJnzFSYrO88UmRPf0ABfVh_fRc2u130");
+
+            Assert.IsNotNull(result);
+        }
+
+        [TestMethod]
+        public async Task GetMintTest()
+        {
+            var graph = new GraphqlClient(new HttpClient());
+
+            var result = await graph.GetTransactionsIn("CeiYr2VjUVAFXmPJvfj-Pfk6zmprBzeqNeRWAbImbOo");
+
+            Assert.IsNotNull(result);
+        }
+    }
+}
diff --git a/src/aoww.Services.Tests/aoww.Services.Tests.csproj b/src/aoww.Services.Tests/aoww.Services.Tests.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\aoww.Services\aoww.Services.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/aoww.Services/Enums/TokenTransferType.cs b/src/aoww.Services/Enums/TokenTransferType.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace aoww.Services.Enums
+{
+    public enum TokenTransferType
+    {
+        Transfer,
+        Mint
+    }
+}
diff --git a/src/aoWebWallet/Services/GraphqlClient.cs → src/aoww.Services/GraphqlClient.cs b/src/aoWebWallet/Services/GraphqlClient.cs → src/aoww.Services/GraphqlClient.cs
@@ -1,16 +1,11 @@
-using aoWebWallet.Models;
-using ArweaveAO.Models.Token;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
+using aoww.Services.Models;
 using System.Net.Http.Json;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Net.WebRequestMethods;
 
-namespace aoWebWallet.Services
+namespace aoww.Services
 {
+    /// <summary>
+    /// https://arweave.net/graphql
+    /// </summary>
     public class GraphqlClient
     {
         private readonly HttpClient httpClient;
@@ -22,7 +17,38 @@ public GraphqlClient(HttpClient httpClient)
 
         public async Task<List<TokenTransfer>> GetTransactionsIn(string adddress, string? fromTxId = null)
         {
-            string query = "query {\r\n  transactions(\r\n    first: 100\r\n sort: HEIGHT_DESC\r\n    tags: [\r\n      { name: \"Data-Protocol\", values: [\"ao\"] }\r\n      { name: \"Action\", values: [\"Transfer\"] }\r\n      { name: \"Recipient\", values: [\"" + adddress + "\"] }\r\n    ]\r\n  ) {\r\n    edges {\r\n      node {\r\n        id\r\n        recipient\r\n        owner {\r\n          address\r\n        }\r\n        block {\r\n          timestamp\r\n          height\r\n        }\r\n        tags {\r\n          name\r\n          value\r\n        }\r\n      }\r\n    }\r\n  }\r\n}\r\n";
+            string query = $$"""
+                                query {
+                                  transactions(
+                                    first: 100
+                                    sort: HEIGHT_DESC
+                                    tags: [
+                                      { name: "Data-Protocol", values: ["ao"] }
+                                      { name: "Action", values: ["Transfer", "Mint-Token"] }
+                                      { name: "Recipient", values: ["{{adddress}}"] }
+                                    ]
+                                  ) {
+                                    edges {
+                                      node {
+                                        id
+                                        recipient
+                                        owner {
+                                          address
+                                        }
+                                        block {
+                                          timestamp
+                                          height
+                                        }
+                                        tags {
+                                          name
+                                          value
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                                
+                                """;
             var queryResult = await PostQueryAsync(query);
 
             var result = new List<TokenTransfer>();
@@ -31,7 +57,7 @@ public async Task<List<TokenTransfer>> GetTransactionsIn(string adddress, string
             {
                 TokenTransfer? transaction = GetTransaction(edge);
 
-                if(transaction != null)
+                if (transaction != null)
                     result.Add(transaction);
             }
 
@@ -44,15 +70,21 @@ public async Task<List<TokenTransfer>> GetTransactionsIn(string adddress, string
                 return null;
 
             var isTransfer = edge.Node.Tags.Where(x => x.Name == "Action" && x.Value == "Transfer").Any();
-            if (!isTransfer)
+            var isMint = edge.Node.Tags.Where(x => x.Name == "Action" && x.Value == "Mint-Token").Any();
+            if (!isTransfer && !isMint)
                 return null;
 
             var transaction = new TokenTransfer()
             {
                 Id = edge.Node.Id,
-                From = edge.Node.Owner?.Address ?? string.Empty
+                From = edge.Node.Owner?.Address ?? string.Empty,
+                TokenTransferType = Enums.TokenTransferType.Transfer
             };
 
+            if (isMint)
+                transaction.TokenTransferType = Enums.TokenTransferType.Mint;
+
+
             if (edge.Node.Block != null)
             {
                 transaction.Timestamp = DateTimeOffset.FromUnixTimeSeconds(edge.Node.Block.Timestamp);
@@ -65,9 +97,13 @@ public async Task<List<TokenTransfer>> GetTransactionsIn(string adddress, string
             if (!string.IsNullOrEmpty(fromProcess))
                 transaction.From = fromProcess;
 
-            transaction.TokenId = edge.Node.Recipient;
+            if (isMint)
+                transaction.TokenId = edge.Node.Tags.Where(x => x.Name == "TokenId").Select(x => x.Value).FirstOrDefault();
+            else
+                transaction.TokenId = edge.Node.Recipient;
+
             transaction.To = edge.Node.Tags.Where(x => x.Name == "Recipient").Select(x => x.Value).FirstOrDefault();
-            
+
             string? quantity = edge.Node.Tags.Where(x => x.Name == "Quantity").Select(x => x.Value).FirstOrDefault();
             if (!string.IsNullOrWhiteSpace(quantity) && long.TryParse(quantity, out long quantityLong))
                 transaction.Quantity = quantityLong;
@@ -374,7 +410,7 @@ public async Task<List<AoProcessInfo>> GetAoProcessesForAddress(string address)
 
         protected async Task<GraphqlResponse?> PostQueryAsync(string query)
         {
-            var request = new GraphqlRequest { Query = query};
+            var request = new GraphqlRequest { Query = query };
 
             HttpResponseMessage res = await httpClient.PostAsJsonAsync("https://arweave.net/graphql", request);
             if (res.IsSuccessStatusCode)

diff --git a/src/aoWebWallet/Models/AoProcessInfo.cs → src/aoww.Services/Models/AoProcessInfo.cs b/src/aoWebWallet/Models/AoProcessInfo.cs → src/aoww.Services/Models/AoProcessInfo.cs
@@ -1,4 +1,4 @@
-namespace aoWebWallet.Models
+namespace aoww.Services.Models
 {
     public class AoProcessInfo
     {

diff --git a/src/aoWebWallet/Models/GraphqlRequest.cs → src/aoww.Services/Models/GraphqlRequest.cs b/src/aoWebWallet/Models/GraphqlRequest.cs → src/aoww.Services/Models/GraphqlRequest.cs
@@ -1,4 +1,4 @@
-namespace aoWebWallet.Models
+namespace aoww.Services.Models
 {
     public class GraphqlRequest
     {

diff --git a/src/aoWebWallet/Models/GraphqlResponse.cs → src/aoww.Services/Models/GraphqlResponse.cs b/src/aoWebWallet/Models/GraphqlResponse.cs → src/aoww.Services/Models/GraphqlResponse.cs
@@ -1,9 +1,6 @@
-using ArweaveAO.Models;
-using MudBlazor;
-using System.Text.Json.Serialization;
-using static System.Runtime.InteropServices.JavaScript.JSType;
+using System.Text.Json.Serialization;
 
-namespace aoWebWallet.Models
+namespace aoww.Services.Models
 {
     public class GraphqlResponse
     {

diff --git a/src/aoww.Services/Models/Tag.cs b/src/aoww.Services/Models/Tag.cs
@@ -0,0 +1,15 @@
+using System.Diagnostics;
+using System.Text.Json.Serialization;
+
+namespace aoww.Services.Models
+{
+    [DebuggerDisplay("{Name}: {Value}")]
+    public class Tag
+    {
+        [JsonPropertyName("name")]
+        public required string Name { get; set; }
+
+        [JsonPropertyName("value")]
+        public required string Value { get; set; }
+    }
+}
diff --git a/src/aoWebWallet/Models/TokenTransfer.cs → src/aoww.Services/Models/TokenTransfer.cs b/src/aoWebWallet/Models/TokenTransfer.cs → src/aoww.Services/Models/TokenTransfer.cs
@@ -3,8 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using aoww.Services.Enums;
 
-namespace aoWebWallet.Models
+namespace aoww.Services.Models
 {
     public class TokenTransfer
     {
@@ -15,5 +16,7 @@ public class TokenTransfer
         public required string From { get; set; }
         public string? To { get; set; }
         public long Quantity { get; set; }
+
+        public TokenTransferType TokenTransferType { get; set; }
     }
 }
diff --git a/src/aoww.Services/aoww.Services.csproj b/src/aoww.Services/aoww.Services.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>