Refactor dynamic usage to object

Aptos/Aptos.Clients/AccountClient.cs

@@ -4,6 +4,7 @@ namespace Aptos;
 using Aptos.Exceptions;
 using Aptos.Indexer.GraphQL;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 public class AccountClient(AptosClient client)
 {
@@ -381,13 +382,15 @@ public async Task<AccountAddress> LookupOriginalAccountAddress(string authentica
         }
         catch (Exception e)
         {
+#pragma warning disable CS8602 // Dereference of a possibly null reference.
             if (
                 e is ApiException apex
-                && apex.Data["error_code"]?.ToString() == "table_item_not_found"
+                && (apex.Data as JObject)["error_code"]?.ToString() == "table_item_not_found"
             )
             {
                 return AccountAddress.From(authenticationKey);
             }
+#pragma warning restore CS8602 // Dereference of a possibly null reference.
             throw e;
         }
     }

Aptos/Aptos.Clients/AptosClient/AptosClient.Get.cs

@@ -2,14 +2,14 @@ namespace Aptos;
 
 public class GetAptosRequest(
     string? path = null,
-    dynamic? body = null,
+    object? body = null,
     string? contentType = null,
     Dictionary<string, string>? queryParams = null,
     string? originMethod = null
 ) : BaseAptosRequest
 {
     public override string? Path { get; set; } = path;
-    public override dynamic? Body { get; set; } = body;
+    public override object? Body { get; set; } = body;
     public override string? ContentType { get; set; } = contentType;
     public override Dictionary<string, string>? QueryParams { get; set; } = queryParams;
     public override string? OriginMethod { get; set; } = originMethod;

Aptos/Aptos.Clients/AptosClient/AptosClient.Post.cs

@@ -2,14 +2,14 @@ namespace Aptos;
 
 public class PostAptosRequest(
     string? path = null,
-    dynamic? body = null,
+    object? body = null,
     string? contentType = null,
     Dictionary<string, string>? queryParams = null,
     string? originMethod = null
 ) : BaseAptosRequest
 {
     public override string? Path { get; set; } = path;
-    public override dynamic? Body { get; set; } = body;
+    public override object? Body { get; set; } = body;
     public override string? ContentType { get; set; } = contentType;
     public override Dictionary<string, string>? QueryParams { get; set; } = queryParams;
     public override string? OriginMethod { get; set; } = originMethod;

Aptos/Aptos.Clients/AptosClient/AptosClient.Requests.cs

@@ -8,7 +8,7 @@ public abstract class BaseAptosRequest
 {
     public abstract string? Path { get; set; }
 
-    public abstract dynamic? Body { get; set; }
+    public abstract object? Body { get; set; }
 
     public abstract string? ContentType { get; set; }
 
@@ -21,15 +21,15 @@ public class AptosRequest(
     string url,
     HttpMethod method,
     string? path = null,
-    dynamic? body = null,
+    object? body = null,
     string? contentType = null,
     Dictionary<string, string>? queryParams = null,
     string? originMethod = null
 ) : BaseAptosRequest
 {
     public string Url { get; set; } = url;
     public override string? Path { get; set; } = path;
-    public override dynamic? Body { get; set; } = body;
+    public override object? Body { get; set; } = body;
     public override string? ContentType { get; set; } = contentType;
     public override Dictionary<string, string>? QueryParams { get; set; } = queryParams;
     public override string? OriginMethod { get; set; } = originMethod;
@@ -46,7 +46,7 @@ public AptosRequest(string url, HttpMethod method, BaseAptosRequest request)
             url,
             method,
             request.Path,
-            (object?)request.Body,
+            request.Body,
             request.ContentType,
             request.QueryParams,
             request.OriginMethod
@@ -106,7 +106,7 @@ public async Task<AptosResponse<Res>> Request<Res>(ApiType type, AptosRequest re
 
         ClientResponse<Res> clientResponse = await ClientRequest<Res>(clientRequest);
 
-        AptosResponse<dynamic> errorResponse =
+        AptosResponse<object> errorResponse =
             new(
                 clientResponse.Status,
                 clientResponse.StatusText,

Aptos/Aptos.Clients/IndexerClient.cs

@@ -66,7 +66,7 @@ Func<IAptosIndexerClient, Task<IOperationResult<Res>>> query
             throw new ApiException(
                 ApiType.Indexer,
                 request,
-                new AptosResponse<dynamic>(
+                new AptosResponse<object>(
                     200,
                     exception.Message,
                     JObject.FromObject(new { errors = exception.Errors }),

Aptos/Aptos.Clients/RequestClient/RequestClient.cs

@@ -5,7 +5,7 @@ namespace Aptos;
 public class ClientRequest(
     string url,
     HttpMethod method,
-    dynamic? body = null,
+    object? body = null,
     string? contentType = null,
     Dictionary<string, string>? queryParams = null,
     Dictionary<string, string>? headers = null
@@ -15,7 +15,7 @@ public class ClientRequest(
 
     public HttpMethod Method = method;
 
-    public dynamic? Body = body;
+    public object? Body = body;
 
     public string? ContentType = contentType;
 
@@ -28,7 +28,7 @@ public class ClientResponse<Res>(
     int status,
     string statusText,
     Res? data,
-    dynamic? error = null,
+    object? error = null,
     HttpResponseMessage? response = null,
     Dictionary<string, string>? headers = null
 )
@@ -40,7 +40,7 @@ public class ClientResponse<Res>(
     /// <summary>
     /// The error object returned by the API. This can be a JObject or a string.
     /// </summary>
-    public dynamic? Error = error;
+    public object? Error = error;
     public HttpResponseMessage? Response = response;
     public Dictionary<string, string>? Headers = headers ?? [];
 }

Aptos/Aptos.Core/Utilities.cs

@@ -82,7 +82,7 @@ public static long FloorToWholeHour(long timestampInSeconds)
             return flooredDateTime.ToUnixTimeSeconds();
         }
 
-        public static dynamic? DeserializeJObjectOrString(string value)
+        public static object? DeserializeJObjectOrString(string value)
         {
             try
             {

Aptos/Aptos.Exceptions/ApiException.cs

@@ -16,11 +16,11 @@ public class ApiException : BaseException
         /// <summary>
         /// The error object returned by the API. This can be a JObject or a string.
         /// </summary>
-        public new readonly dynamic Data;
+        public new readonly object Data;
 
         public readonly AptosRequest Request;
 
-        public ApiException(ApiType type, AptosRequest request, AptosResponse<dynamic> response)
+        public ApiException(ApiType type, AptosRequest request, AptosResponse<object> response)
             : base(DeriveErrorMessage(type, request, response))
         {
             Url = request.Url;
@@ -33,7 +33,7 @@ public ApiException(ApiType type, AptosRequest request, AptosResponse<dynamic> r
         private static string DeriveErrorMessage(
             ApiType type,
             AptosRequest request,
-            AptosResponse<dynamic> response
+            AptosResponse<object> response
         )
         {
             string? traceId = response.Headers.TryGetValue("traceparent", out string? value)

Aptos/Aptos.Transactions/TypeTag/TypeTag.cs

@@ -25,7 +25,7 @@ public abstract partial class TypeTag(TypeTagVariant variant) : Serializable
 
     public override string ToString() => $"{Variant.ToString().ToLower()}";
 
-    public bool CheckType(dynamic value)
+    public bool CheckType(object value)
     {
         switch (Variant)
         {
@@ -51,7 +51,7 @@ public bool CheckType(dynamic value)
                         if (value.GetType().Name.Contains("MoveVector"))
                         {
                             // Cannot pattern match on MoveVector<T> because it's a generic type
-                            MoveVector<dynamic>? vector = value as MoveVector<dynamic>;
+                            MoveVector<object>? vector = value as MoveVector<object>;
                             if (vector == null)
                                 return false;
                             return typeTagVector.Value.CheckType(vector.Values[0]);
@@ -71,10 +71,10 @@ public bool CheckType(dynamic value)
                         if (value.GetType().Name.Contains("MoveOption"))
                         {
                             // Cannot pattern match on MoveVector<T> because it's a generic type
-                            MoveOption<dynamic>? option = value as MoveOption<dynamic>;
+                            MoveOption<object>? option = value as MoveOption<object>;
                             if (option?.Value != null && typeTagStruct.Value.TypeArgs.Count > 0)
                             {
-                                return typeTagStruct.Value.TypeArgs[0].CheckType(option?.Value);
+                                return typeTagStruct.Value.TypeArgs[0].CheckType(option?.Value!);
                             }
                         }
                     }