Refactoring to support resolveAddress

Author: mikera

convex-restapi/src/main/java/convex/restapi/api/ABaseAPI.java

@@ -1,9 +1,15 @@
 package convex.restapi.api;
 
 import convex.peer.Server;
+import convex.core.cvm.Address;
+import convex.core.data.AString;
+import convex.core.data.ACell;
+import convex.core.lang.Reader;
 import convex.restapi.RESTServer;
+import convex.core.lang.RT;
 import io.javalin.http.BadRequestResponse;
 import io.javalin.http.Context;
+import convex.core.data.AVector;
 
 /**
  * Base class for API based services
@@ -132,5 +138,30 @@ protected long[] getPaginationRange(Context ctx, long maxIndex) {
 		return range;
 	}
 
+	/**
+	 * Attempt to resolve an address from an arbitrary object, including possible CNS lookups.
+	 * @param o Object to resolve an address from.
+	 * @return Address instance, or null if not a valid address.
+	 */
+	protected static Address resolveAddress(ACell o) {
+		if (o instanceof Address a) {
+			return a;
+		}
+
+		if (o instanceof AVector v) {
+			if (v.count() !=2) return null; // must be a scoped address
+			return resolveAddress(v.get(0)); // resolve the base address
+		}
 
+		try {
+			// If it's a String, try to parse it as an address
+			AString s = RT.ensureString(o);
+			if (s != null) {
+				return resolveAddress(Reader.read(s));
+			}
+			return null;
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Unable to resolve address from object: "+o+" cause: "+e.getMessage(), e);
+		}
+	}
 }

convex-restapi/src/main/java/convex/restapi/api/McpAPI.java

@@ -401,7 +401,7 @@ public AMap<AString, ACell> handle(AMap<AString, ACell> arguments) throws Interr
 				} catch (Exception e) {
 					return toolError("Failed to parse query source: " + e.getMessage());
 				}
-				Address address = Address.parse(arguments.get(ARG_ADDRESS));
+				Address address = resolveAddress(arguments.get(ARG_ADDRESS)); // OK if null
 				Convex convex = restServer.getConvex();
 				Result result = convex.querySync(form, address);
 				return toolResult(result);
@@ -436,7 +436,12 @@ public AMap<AString, ACell> handle(AMap<AString, ACell> arguments) throws Interr
 			if ((seedBlob == null) || (seedBlob.count() != AKeyPair.SEED_LENGTH)) {
 				return toolError("Seed must be 32-byte hex string");
 			}
-			Address address= Address.parse(addressCell.toString());
+			Address address;
+			try {
+				address = resolveAddress(addressCell);
+			} catch (IllegalArgumentException e) {
+				return toolError("Invalid address format: " + e.getMessage());
+			}
 			if (address == null) {
 				return toolError("Invalid address format");
 			}
@@ -469,7 +474,12 @@ public AMap<AString, ACell> handle(AMap<AString, ACell> arguments) throws Interr
 			if (addressCell == null) {
 				return protocolError(-32602, "Prepare requires 'address' string");
 			}
-			Address address = Address.parse(addressCell.toString());
+			Address address;
+			try {
+				address = resolveAddress(addressCell);
+			} catch (IllegalArgumentException e) {
+				return toolError("Invalid address format: " + e.getMessage());
+			}
 			if (address == null) {
 				return toolError("Invalid address format");
 			}
@@ -875,7 +885,12 @@ private class DescribeAccountTool extends McpTool {
 		@Override
 		public AMap<AString, ACell> handle(AMap<AString, ACell> arguments) throws InterruptedException {
 			try {
-				Address address = Address.parse(RT.getIn(arguments,ARG_ADDRESS));
+				Address address;
+				try {
+					address = resolveAddress(RT.getIn(arguments,ARG_ADDRESS));
+				} catch (IllegalArgumentException e) {
+					return toolError("Invalid address format: " + e.getMessage());
+				}
 				if (address == null) {
 					return toolError("No valid address provided");
 				}
@@ -929,7 +944,12 @@ public AMap<AString, ACell> handle(AMap<AString, ACell> arguments) throws Interr
 				if (addressCell == null) {
 					return toolError("Lookup requires 'address' parameter, e.g. '#5675' or '@convex.core'");
 				}
-				Address address = Address.parse(addressCell);
+				Address address;
+				try {
+					address = resolveAddress(addressCell);
+				} catch (IllegalArgumentException e) {
+					return toolError("Invalid address format: " + e.getMessage());
+				}
 				if (address == null) {
 					return toolError("Invalid address format");
 				}