V3Call testing

.vscode/launch.json

@@ -2,20 +2,10 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			// Use IntelliSense to find out which attributes exist for C# debugging
-			// Use hover for the description of the existing attributes
-			// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-			"name": ".NET Core Launch (console)",
-			"type": "coreclr",
+			"name": "Sample.RestAPI",
+			"type": "dotnet",
 			"request": "launch",
-			"preLaunchTask": "build",
-			// If you have changed target frameworks, make sure to update the program path.
-			"program": "${workspaceFolder}/src/Sample/bin/Debug/net8.0/Sample.dll",
-			"args": [],
-			"cwd": "${workspaceFolder}/src/Sample",
-			// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
-			"console": "internalConsole",
-			"stopAtEntry": false
+			"projectPath": "${workspaceFolder}/samples/Sample.RestAPI/Sample.RestAPI.csproj"
 		},
 		{
 			"name": ".NET Core Attach",

.vscode/tasks.json

@@ -12,7 +12,11 @@
 				"${workspaceFolder}",
 				"/property:GenerateFullPaths=true"
 			],
-			"problemMatcher": "$msCompile"
+			"problemMatcher": "$msCompile",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
 		}
 	]
 }

samples/Sample.PocketIC/PocketIc.Tests.cs

@@ -120,7 +120,7 @@ public async Task HttpGateway_CounterWasm__Basic__Valid()
 
 
 						CancellationTokenSource cts = new(TimeSpan.FromSeconds(5));
-						CandidArg incResponseArg = await agent.CallAndWaitAsync(canisterId, "inc", CandidArg.Empty(), cancellationToken: cts.Token);
+						CandidArg incResponseArg = await agent.CallAsync(canisterId, "inc", CandidArg.Empty(), cancellationToken: cts.Token);
 						Assert.Equal(CandidArg.Empty(), incResponseArg);
 
 						// This alternative also doesnt work
@@ -137,7 +137,7 @@ public async Task HttpGateway_CounterWasm__Basic__Valid()
 						Assert.Equal((UnboundedUInt)1, getResponseValue);
 
 						CandidArg setRequestArg = CandidArg.FromObjects((UnboundedUInt)10);
-						CandidArg setResponseArg = await agent.CallAndWaitAsync(canisterId, "set", setRequestArg);
+						CandidArg setResponseArg = await agent.CallAsync(canisterId, "set", setRequestArg);
 						Assert.Equal(CandidArg.Empty(), setResponseArg);
 
 						getResponse = await agent.QueryAsync(canisterId, "get", CandidArg.Empty());

samples/Sample.RestAPI/Controllers/GovernanceController.cs

@@ -22,5 +22,13 @@ public async Task<IActionResult> GetProposalInfo(ulong id)
 			OptionalValue<ProposalInfo> info = await this.Client.GetProposalInfo(id);
 			return this.Ok(info);
 		}
+
+		[Route("rewards")]
+		[HttpGet]
+		public async Task<IActionResult> GetRewards()
+		{
+			Result4 rewards = await this.Client.GetMonthlyNodeProviderRewards();
+			return this.Ok(rewards);
+		}
 	}
 }

src/Agent/Agents/HttpAgent.cs

@@ -100,14 +100,14 @@ public async Task<CandidArg> CallAsync(
 
 			byte[] cborBytes = await httpResponse.GetContentAsync();
 			var reader = new CborReader(cborBytes);
-			Certificate certificate = Certificate.FromCbor(reader);
+			V3CallResponse v3CallResponse = V3CallResponse.ReadCbor(reader);
 
 			SubjectPublicKeyInfo rootPublicKey = await this.GetRootKeyAsync(cancellationToken);
-			if (!certificate.IsValid(this.bls, rootPublicKey))
+			if (!v3CallResponse.Certificate.IsValid(this.bls, rootPublicKey))
 			{
 				throw new InvalidCertificateException("Certificate signature does not match the IC public key");
 			}
-			HashTree? requestStatusData = certificate.Tree.GetValueOrDefault(StatePath.FromSegments("request_status", requestId.RawValue));
+			HashTree? requestStatusData = v3CallResponse.Certificate.Tree.GetValueOrDefault(StatePath.FromSegments("request_status", requestId.RawValue));
 			RequestStatus? requestStatus = ParseRequestStatus(requestStatusData);
 			switch (requestStatus?.Type)
 			{

src/Agent/Responses/V3CallResponse.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Diagnostics;
+using System.Formats.Cbor;
+using EdjCase.ICP.Agent.Models;
+using EdjCase.ICP.Candid.Models;
+
+namespace EdjCase.ICP.Agent.Responses
+{
+	/// <summary>
+	/// Model for a reponse to a read state request
+	/// </summary>
+	public class V3CallResponse
+	{
+		/// <summary>
+		/// The status of the call ('replied', 'rejected', 'done)
+		/// </summary>
+		public string Status { get; }
+		/// <summary>
+		/// The certificate data of the current canister state
+		/// </summary>
+		public Certificate Certificate { get; }
+
+		/// <param name="status">The status of the call ('replied', 'rejected', 'done)</param>
+		/// <param name="certificate">The certificate data of the current canister state</param>
+		/// <exception cref="ArgumentNullException"></exception>
+		public V3CallResponse(string status, Certificate certificate)
+		{
+			this.Status = status ?? throw new ArgumentNullException(nameof(status));
+			this.Certificate = certificate ?? throw new ArgumentNullException(nameof(certificate));
+		}
+
+
+		internal static V3CallResponse ReadCbor(CborReader reader)
+		{
+			if (reader.ReadTag() != CborTag.SelfDescribeCbor)
+			{
+				throw new CborContentException("Expected self describe tag");
+			}
+			Certificate? certificate = null;
+			string? status = null;
+			reader.ReadStartMap();
+			while (reader.PeekState() != CborReaderState.EndMap)
+			{
+				string field = reader.ReadTextString();
+				switch (field)
+				{
+					case "certificate":
+						var certReader = new CborReader(reader.ReadByteString());
+						certificate = Certificate.FromCbor(certReader);
+						break;
+					case "status":
+						status = reader.ReadTextString();
+						break;
+					default:
+						Debug.WriteLine($"Unknown field '{field}' in v3 call response");
+						reader.SkipValue();
+						break;
+				}
+			}
+			reader.ReadEndMap();
+
+			if (status == null)
+			{
+				throw new CborContentException("Missing field: status");
+			}
+
+			if (certificate == null)
+			{
+				throw new CborContentException("Missing field: certificate");
+			}
+
+			return new V3CallResponse(status, certificate);
+		}
+	}
+}