Support Reader tag #Signed for SignedData

Author: mikera

convex-core/src/main/java/convex/core/data/Cells.java

@@ -264,18 +264,25 @@ public static <T extends ACell> T intern(T value) {
 
 	@SuppressWarnings("unchecked")
 	public static ACell createTagged(Symbol sym, ACell value) throws ParseException {
-		
 		switch (sym.getName().toString()) {
-		case "Index": 
-			if (!(value instanceof AHashMap)) throw new ParseException(sym+" tag must be on a map");
-			Index<ABlobLike<?>,ACell> index= Index.create((AHashMap<ABlobLike<?>,ACell>)value);
-			if (index==null) throw new ParseException("Invalid #Index keys");
-			return index;
-		case "Result": 
-			if (!(value instanceof AHashMap)) throw new ParseException(sym+" tag must be on a map");
-			Result r= Result.fromData((AHashMap<ABlobLike<?>,ACell>)value);
-			if (r==null) throw new ParseException("Invalid #Result keys");
-			return r;
+			case "Index": {
+				if (!(value instanceof AHashMap)) throw new ParseException(sym+" tag must be on a map");
+				Index<ABlobLike<?>,ACell> index= Index.create((AHashMap<ABlobLike<?>,ACell>)value);
+				if (index==null) throw new ParseException("Invalid #Index keys");
+				return index;
+			}
+			case "Result": {
+				if (!(value instanceof AHashMap)) throw new ParseException(sym+" tag must be on a map");
+				Result r= Result.fromData((AHashMap<ABlobLike<?>,ACell>)value);
+				if (r==null) throw new ParseException("Invalid #Result keys");
+				return r;
+			}
+			case "Signed": {
+				if (!(value instanceof AHashMap)) throw new ParseException(sym+" tag must be on a map");
+				SignedData<?> r= SignedData.fromData((AHashMap<Keyword,ACell>)value);
+				if (r==null) throw new ParseException("Invalid #Signed keys");
+				return r;
+			}
 		}
 		return value;
 	}

convex-core/src/main/java/convex/core/data/SignedData.java

@@ -4,9 +4,11 @@
 import convex.core.crypto.ASignature;
 import convex.core.crypto.Ed25519Signature;
 import convex.core.crypto.Providers;
+import convex.core.data.util.BlobBuilder;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.BadSignatureException;
 import convex.core.exceptions.InvalidDataException;
+import convex.core.lang.RT;
 import convex.core.lang.RecordFormat;
 
 /**
@@ -50,6 +52,7 @@ public final class SignedData<T extends ACell> extends ARecord {
 	private static final Keyword[] KEYS = new Keyword[] { Keywords.PUBLIC_KEY, Keywords.SIGNATURE, Keywords.VALUE };
 
 	private static final RecordFormat FORMAT = RecordFormat.of(KEYS);
+	private static final StringShort SIGNED_TAG = StringShort.create("#Signed");
 
 	//Cached fields
 	private AccountKey verifiedKey=null;
@@ -196,6 +199,14 @@ public int encodeRaw(byte[] bs, int pos) {
 		pos = valueRef.encode(bs,pos);
 		return pos;
 	}
+	
+	@Override
+	public boolean print(BlobBuilder sb, long limit) {
+		sb.append(SIGNED_TAG);
+		sb.append(' ');
+		return super.print(sb,limit);
+	}
+
 
 	@Override
 	public int estimatedEncodingSize() {
@@ -390,4 +401,12 @@ public boolean equals(ACell o) {
 		return valueRef.equals(b.valueRef);
 	}
 
+	@SuppressWarnings("unchecked")
+	public static <T extends ACell> SignedData<T> fromData(AHashMap<Keyword, ACell> value) {
+		Ref<T> ref=Ref.get((T)(value.get(Keywords.VALUE)));
+		AccountKey key=AccountKey.parse(value.get(Keywords.PUBLIC_KEY));
+		ASignature sig=ASignature.fromBlob(RT.ensureBlob(value.get(Keywords.SIGNATURE)));
+		return create(key,sig,ref);
+	}
+
 }

convex-core/src/test/java/convex/core/lang/ReaderTest.java

@@ -360,6 +360,7 @@ public void testMetadata() {
 		doIdempotencyTest(CVMBool.TRUE);
 		doIdempotencyTest(Samples.LONG_MAP_10);
 		doIdempotencyTest(Samples.BAD_HASH);
+		doIdempotencyTest(Samples.INT_INDEX_7);
 		doIdempotencyTest(Reader.readAll("(def ^{:foo 2} a 1)"));
 		doIdempotencyTest(Reader.readAll("(fn ^{:foo 2} [] bar/baz)"));
 	}
@@ -397,6 +398,7 @@ public void doIdempotencyTest(ACell cell) {
 		doReadPrintTest("\"[\""); // string containing a single square bracket should be OK
 		doReadPrintTest("1.0");
 		doReadPrintTest("[:foo bar]");
+		doReadPrintTest("#Index {}");
 		doReadPrintTest("^{} 0xa89e59cc8ab9fc6a13785a37938c85b306b24663415effc01063a6e25ef52ebcd3647d3a77e0a33908a372146fdccab6");
 	}
 

convex-peer/src/main/java/convex/api/Convex.java

@@ -408,13 +408,18 @@ public final synchronized CompletableFuture<Result> transact(ATransaction transa
 	 * @return Signed transaction ready to submit
 	 * @throws ResultException If an error occurs preparing the transaction (e.g. failure to pre-compile)
 	 */
+	@SuppressWarnings("unchecked")
 	public SignedData<ATransaction> prepareTransaction(ACell code) throws ResultException,InterruptedException {
 		ATransaction transaction;
 		if (code instanceof ATransaction) {
 			transaction=(ATransaction)code;
-		} else if (code instanceof SignedData) {
-			throw new IllegalArgumentException("Can't prepare transaction that is already signed");
 		} else {
+			if (code instanceof SignedData) {
+				SignedData<?> signed=(SignedData<?>) code;
+				ACell val=signed.getValue();
+				if (val instanceof ATransaction) return (SignedData<ATransaction>) signed;
+				code=val;
+			} 
 			if (isPreCompile() ) {
 				Result compResult=preCompile(code).join();
 				if (compResult.isError()) throw new ResultException(compResult);