Merge pull request #167 from IOTA-NET/new-api-fixes

wireless90 · web-flow · commit 437e857dd48b · 2023-05-31T22:05:30.000+08:00
New api fixes
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandHandler.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandHandler.cs
@@ -8,7 +8,9 @@ public class StoreMnemonicCommandHandler : IRequestHandler<StoreMnemonicCommand,
     {
         public async Task<StoreMnemonicResponse> Handle(StoreMnemonicCommand request, CancellationToken cancellationToken)
         {
-            StoreMnemonicCommandMessage message = new StoreMnemonicCommandMessage(request.Mnemonic);
+            StoreMnemonicCommandMessageData messageData = new StoreMnemonicCommandMessageData(request.Mnemonic);
+            StoreMnemonicCommandMessage message = new StoreMnemonicCommandMessage(messageData);
+
             string messageJson = JsonConvert.SerializeObject(message);
             RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(messageJson);
 
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandMessage.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandMessage.cs
@@ -2,14 +2,14 @@
 
 namespace IotaWalletNet.Application.WalletContext.Commands.StoreMnemonic
 {
-    internal class StoreMnemonicCommandMessage : Message<string>
+    internal class StoreMnemonicCommandMessage : Message<StoreMnemonicCommandMessageData>
     {
         private const string COMMAND = "storeMnemonic";
 
-        public StoreMnemonicCommandMessage(string mnemonic)
+        public StoreMnemonicCommandMessage(StoreMnemonicCommandMessageData storeMnemonicCommandMessageData)
         {
             Cmd = COMMAND;
-            Payload = mnemonic;
+            Payload = storeMnemonicCommandMessageData;
         }
     }
 }
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandMessageData.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/StoreMnemonic/StoreMnemonicCommandMessageData.cs
@@ -0,0 +1,12 @@
+﻿namespace IotaWalletNet.Application.WalletContext.Commands.StoreMnemonic
+{
+    internal class StoreMnemonicCommandMessageData
+    {
+        public StoreMnemonicCommandMessageData(string mnemonic)
+        {
+            Mnemonic= mnemonic;
+        }
+
+        public string Mnemonic { get; private set; }
+    }
+}
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandHandler.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandHandler.cs
@@ -8,7 +8,8 @@ public class VerifyMnemonicCommandHandler : IRequestHandler<VerifyMnemonicComman
     {
         public async Task<VerifyMnemonicResponse> Handle(VerifyMnemonicCommand request, CancellationToken cancellationToken)
         {
-            VerifyMnemonicCommandMessage message = new VerifyMnemonicCommandMessage(request.Mnemonic);
+            VerifyMnemonicCommandMessageData messageData = new VerifyMnemonicCommandMessageData(request.Mnemonic);
+            VerifyMnemonicCommandMessage message = new VerifyMnemonicCommandMessage(messageData);
             string json = JsonConvert.SerializeObject(message);
             RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(json);
 
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandMessage.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandMessage.cs
@@ -2,14 +2,14 @@
 
 namespace IotaWalletNet.Application.WalletContext.Commands.VerifyMnemonic
 {
-    public class VerifyMnemonicCommandMessage : Message<string>
+    internal class VerifyMnemonicCommandMessage : Message<VerifyMnemonicCommandMessageData>
     {
         private const string COMMAND = "verifyMnemonic";
 
-        public VerifyMnemonicCommandMessage(string mnemonic)
+        public VerifyMnemonicCommandMessage(VerifyMnemonicCommandMessageData verifyMnemonicCommandMessageData)
         {
             Cmd = COMMAND;
-            Payload = mnemonic;
+            Payload = verifyMnemonicCommandMessageData;
         }
     }
 }
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandMessageData.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicCommandMessageData.cs
@@ -0,0 +1,12 @@
+﻿namespace IotaWalletNet.Application.WalletContext.Commands.VerifyMnemonic
+{
+    internal class VerifyMnemonicCommandMessageData
+    {
+        public VerifyMnemonicCommandMessageData(string mnemonic)
+        {
+            Mnemonic = mnemonic;
+        }
+
+        public string Mnemonic { get; set; }
+    }
+}
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryHandler.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryHandler.cs
@@ -9,7 +9,8 @@ public partial class GetAccountQueryHandler : IRequestHandler<GetAccountQuery, G
     {
         public async Task<GetAccountResponse> Handle(GetAccountQuery request, CancellationToken cancellationToken)
         {
-            GetAccountQueryMessage message = new GetAccountQueryMessage(request.Username);
+            GetAccountQueryMessageData messageData = new GetAccountQueryMessageData(request.Username);
+            GetAccountQueryMessage message = new GetAccountQueryMessage(messageData);
             string json = JsonConvert.SerializeObject(message);
             RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(json);
 
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryMessage.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryMessage.cs
@@ -2,14 +2,14 @@
 
 namespace IotaWalletNet.Application.WalletContext.Queries.GetAccount
 {
-    public class GetAccountQueryMessage : Message<string>
+    internal class GetAccountQueryMessage : Message<GetAccountQueryMessageData>
     {
         private const string COMMAND = "getAccount";
 
-        public GetAccountQueryMessage(string username)
+        public GetAccountQueryMessage(GetAccountQueryMessageData getAccountQueryMessageData)
         {
             Cmd = COMMAND;
-            Payload = username;
+            Payload = getAccountQueryMessageData;
         }
     }
 }
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryMessageData.cs b/csharp/IotaWalletNet/IotaWalletNet.Application/WalletContext/Queries/GetAccount/GetAccountQueryMessageData.cs
@@ -0,0 +1,12 @@
+﻿namespace IotaWalletNet.Application.WalletContext.Queries.GetAccount
+{
+    internal class GetAccountQueryMessageData
+    {
+        public GetAccountQueryMessageData(string username)
+        {
+            AccountId= username;
+        }
+
+        public string AccountId { get; private set; }
+    }
+}
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/Events/Subscribe/EventsExample.cs b/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/Events/Subscribe/EventsExample.cs
@@ -69,7 +69,7 @@ public static async Task Run()
                 SyncAccountResponse syncAccountResponse = await account.SyncAccountAsync();
                 Console.WriteLine($"SyncAccountAsync: {syncAccountResponse}");
 
-                await account.ConsolidateOutputsAsync(true);
+                //await account.ConsolidateOutputsAsync(true);
 
                 GetBalanceResponse getBalanceResponse = await account.GetBalanceAsync();
                 Console.WriteLine($"GetBalanceAsync: {getBalanceResponse}");
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/NFTs/Burn/BurnNftExample.cs b/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/NFTs/Burn/BurnNftExample.cs
@@ -56,8 +56,10 @@ public static async Task Run()
                 //Sync account
                 await account.SyncAccountAsync();
 
+                Console.WriteLine(await account.GetBalanceAsync());
+
                 //TODO: Replace with an nft output id from your accounts.
-                string outputId = "0x9c5fc8b575e29377e0401d2cd6138c0f4859fbb95b5acf0ea81b3354de6eb2e70100";
+                string outputId = "0xbb237bab9e5277867c99cb05ce89176838a57bce230a9cd593aee586bffa11b50000";
 
                 var nftId = outputId.ComputeBlake2bHash();
 
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/NFTs/Send/SendNftExample.cs b/csharp/IotaWalletNet/IotaWalletNet.Main/Examples/NFTs/Send/SendNftExample.cs
@@ -57,12 +57,13 @@ public static async Task Run()
 
                 await account.SyncAccountAsync();
 
+                Console.WriteLine(await account.GetBalanceAsync());
 
                 //TODO: Replace with the address of your choice!
                 string receiverAddress = "rms1qz8wf6jrchvsfmcnsfhlf6s53x3u85y0j4hvwth9a5ff3xhrxtmvvyc9ae7";
 
                 //TODO: Replace with an nft output id from your accounts.
-                string outputId = "0x9c5fc8b575e29377e0401d2cd6138c0f4859fbb95b5acf0ea81b3354de6eb2e70000";
+                string outputId = "0xbb237bab9e5277867c99cb05ce89176838a57bce230a9cd593aee586bffa11b50100";
 
                 var nftId = outputId.ComputeBlake2bHash();
 
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Main/IotaWalletNet.Main.csproj b/csharp/IotaWalletNet/IotaWalletNet.Main/IotaWalletNet.Main.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-    <PackageReference Include="SiaSkynet" Version="3.5.0" />
+    <PackageReference Include="SiaSkynet" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Main/Program.cs b/csharp/IotaWalletNet/IotaWalletNet.Main/Program.cs
@@ -1,12 +1,25 @@
-﻿using IotaWalletNet.Main.Examples.Events.WaitForTransactionConfirmation;
+﻿using IotaWalletNet.Main.Examples.Accounts_and_Addresses;
+using IotaWalletNet.Main.Examples.Accounts_and_Addresses.Check_Balance;
+using IotaWalletNet.Main.Examples.Accounts_and_Addresses.Generate_an_Address;
+using IotaWalletNet.Main.Examples.Events.Subscribe;
+using IotaWalletNet.Main.Examples.Events.WaitForTransactionConfirmation;
+using IotaWalletNet.Main.Examples.Native_Tokens.Melt;
+using IotaWalletNet.Main.Examples.Native_Tokens.Mint;
+using IotaWalletNet.Main.Examples.Native_Tokens.Send;
+using IotaWalletNet.Main.Examples.NFTs.Burn;
+using IotaWalletNet.Main.Examples.NFTs.Mint;
+using IotaWalletNet.Main.Examples.NFTs.Send;
 using IotaWalletNet.Main.Examples.Outputs_and_Transactions.Periodic_Syncing;
+using IotaWalletNet.Main.Examples.Outputs_and_Transactions.Request_Tokens_from_Faucet;
+using IotaWalletNet.Main.Examples.Outputs_and_Transactions.Send_a_Transaction;
 
 namespace IotaWalletNet.Main
 {
     internal class Program
     {
         private static async Task Main(string[] args)
         {
+
             //await CreateAWalletAndAccountExample.Run();
 
             //await RequestTokensFromFaucetExample.Run();
@@ -37,7 +50,7 @@ private static async Task Main(string[] args)
             //await ClaimOutputsExample.Run();
 
             //await PeriodicSyncingExample.Run();
-            await WaitForTransactionConfirmationExample.Run();
+            //await WaitForTransactionConfirmationExample.Run();
         }
 
     }
diff --git a/csharp/IotaWalletNet/IotaWalletNet.Tests/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicTests.cs b/csharp/IotaWalletNet/IotaWalletNet.Tests/WalletContext/Commands/VerifyMnemonic/VerifyMnemonicTests.cs
@@ -31,6 +31,15 @@ public async Task WalletShouldValidateFalseForWrongMnemonic()
             IWallet wallet = _serviceScope.ServiceProvider.GetRequiredService<IWallet>();
             wallet = await CreateOfflineFullWalletAsync(wallet, shouldCreateAndStoreMnemonic: false);
             string mnemonic = "hood medal among prevent during embrace inmate swarm ancient damp token rail wolf risk tortoise record dose language rival cloud sting grace palm style";
+            try
+            {
+            await wallet.VerifyMnemonicAsync("asdasd");
+
+            }
+            catch(RustBridgeException e)
+            {
+
+            }
 
             await wallet.Awaiting(x => x.VerifyMnemonicAsync("wrong mnemonic")).Should().ThrowAsync<RustBridgeException>();
             await wallet.Awaiting(x => x.VerifyMnemonicAsync(mnemonic + "random")).Should().ThrowAsync<RustBridgeException>();

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ public class StoreMnemonicCommandHandler : IRequestHandler<StoreMnemonicCommand,`
`8`	`8`	`{`
`9`	`9`	`public async Task<StoreMnemonicResponse> Handle(StoreMnemonicCommand request, CancellationToken cancellationToken)`
`10`	`10`	`{`
`11`		`- StoreMnemonicCommandMessage message = new StoreMnemonicCommandMessage(request.Mnemonic);`
	`11`	`+ StoreMnemonicCommandMessageData messageData = new StoreMnemonicCommandMessageData(request.Mnemonic);`
	`12`	`+ StoreMnemonicCommandMessage message = new StoreMnemonicCommandMessage(messageData);`
	`13`	`+`
`12`	`14`	`string messageJson = JsonConvert.SerializeObject(message);`
`13`	`15`	`RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(messageJson);`
`14`	`16`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace IotaWalletNet.Application.WalletContext.Commands.StoreMnemonic`
`4`	`4`	`{`
`5`		`- internal class StoreMnemonicCommandMessage : Message<string>`
	`5`	`+ internal class StoreMnemonicCommandMessage : Message<StoreMnemonicCommandMessageData>`
`6`	`6`	`{`
`7`	`7`	`private const string COMMAND = "storeMnemonic";`
`8`	`8`
`9`		`- public StoreMnemonicCommandMessage(string mnemonic)`
	`9`	`+ public StoreMnemonicCommandMessage(StoreMnemonicCommandMessageData storeMnemonicCommandMessageData)`
`10`	`10`	`{`
`11`	`11`	`Cmd = COMMAND;`
`12`		`- Payload = mnemonic;`
	`12`	`+ Payload = storeMnemonicCommandMessageData;`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ public class VerifyMnemonicCommandHandler : IRequestHandler<VerifyMnemonicComman`
`8`	`8`	`{`
`9`	`9`	`public async Task<VerifyMnemonicResponse> Handle(VerifyMnemonicCommand request, CancellationToken cancellationToken)`
`10`	`10`	`{`
`11`		`- VerifyMnemonicCommandMessage message = new VerifyMnemonicCommandMessage(request.Mnemonic);`
	`11`	`+ VerifyMnemonicCommandMessageData messageData = new VerifyMnemonicCommandMessageData(request.Mnemonic);`
	`12`	`+ VerifyMnemonicCommandMessage message = new VerifyMnemonicCommandMessage(messageData);`
`12`	`13`	`string json = JsonConvert.SerializeObject(message);`
`13`	`14`	`RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(json);`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace IotaWalletNet.Application.WalletContext.Commands.VerifyMnemonic`
`4`	`4`	`{`
`5`		`- public class VerifyMnemonicCommandMessage : Message<string>`
	`5`	`+ internal class VerifyMnemonicCommandMessage : Message<VerifyMnemonicCommandMessageData>`
`6`	`6`	`{`
`7`	`7`	`private const string COMMAND = "verifyMnemonic";`
`8`	`8`
`9`		`- public VerifyMnemonicCommandMessage(string mnemonic)`
	`9`	`+ public VerifyMnemonicCommandMessage(VerifyMnemonicCommandMessageData verifyMnemonicCommandMessageData)`
`10`	`10`	`{`
`11`	`11`	`Cmd = COMMAND;`
`12`		`- Payload = mnemonic;`
	`12`	`+ Payload = verifyMnemonicCommandMessageData;`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ public partial class GetAccountQueryHandler : IRequestHandler<GetAccountQuery, G`
`9`	`9`	`{`
`10`	`10`	`public async Task<GetAccountResponse> Handle(GetAccountQuery request, CancellationToken cancellationToken)`
`11`	`11`	`{`
`12`		`- GetAccountQueryMessage message = new GetAccountQueryMessage(request.Username);`
	`12`	`+ GetAccountQueryMessageData messageData = new GetAccountQueryMessageData(request.Username);`
	`13`	`+ GetAccountQueryMessage message = new GetAccountQueryMessage(messageData);`
`13`	`14`	`string json = JsonConvert.SerializeObject(message);`
`14`	`15`	`RustBridgeGenericResponse genericResponse = await request.Wallet.SendMessageAsync(json);`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace IotaWalletNet.Application.WalletContext.Queries.GetAccount`
`4`	`4`	`{`
`5`		`- public class GetAccountQueryMessage : Message<string>`
	`5`	`+ internal class GetAccountQueryMessage : Message<GetAccountQueryMessageData>`
`6`	`6`	`{`
`7`	`7`	`private const string COMMAND = "getAccount";`
`8`	`8`
`9`		`- public GetAccountQueryMessage(string username)`
	`9`	`+ public GetAccountQueryMessage(GetAccountQueryMessageData getAccountQueryMessageData)`
`10`	`10`	`{`
`11`	`11`	`Cmd = COMMAND;`
`12`		`- Payload = username;`
	`12`	`+ Payload = getAccountQueryMessageData;`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`