Misc fixes

Author: mikera

convex-core/src/main/java/convex/core/cvm/Peer.java

@@ -777,5 +777,9 @@ private PeerIndex getPeerIndex() {
 		return peerIndex;
 	}
 
+	public SignedData<ATransaction> getTransaction(Hash transactionID) {
+		return getPeerIndex().getTransaction(this, transactionID);
+	}
+
 
 }

convex-core/src/main/java/convex/core/cvm/PeerIndex.java

@@ -63,4 +63,10 @@ public Result getTransactionResult(Peer peer,ABlob txID) {
 		return peer.getBlockResult(loc.get(0).longValue()).getResult(loc.get(1).longValue());
 	}
 
+	public SignedData<ATransaction> getTransaction(Peer peer, Hash transactionID) {
+		AVector<CVMLong> loc=txLocations.get(transactionID);
+		if (loc==null) return null;
+		return peer.getPeerOrder().getBlock(loc.get(0).longValue()).getValue().getTransactions().get(loc.get(1).longValue());
+	}
+
 }

convex-core/src/main/java/convex/core/lang/RT.java

@@ -1100,7 +1100,7 @@ public static AString str(ACell a) {
 	 * Converts a value to a Java String representation
 	 * 
 	 * @param a Any CVM value
-	 * @return Java String representation. May be "nil".
+	 * @return Java String representation. May be "nil" for null values.
 	 */
 	public static String toString(ACell a) {
 		return toString(a, Constants.PRINT_LIMIT);

convex-core/src/main/java/convex/core/util/CAIP.java

@@ -69,8 +69,8 @@ public static ACell parseAssetID(AString assetID) {
 
 	/**
 	 * Gets the asset ID for a CAD29 token from a CAPI-19 string
-	 * @param caip19
-	 * @return CAD29 asset ID, or CONVEX_ASSET_ID contant if the String refers to CVM
+	 * @param caip19 CAIP19 Format asset ID, e.g. "cad29:72"
+	 * @return CAD29 asset ID, or CONVEX_ASSET_ID constant if the String refers to CVM
 	 * @throw IllegalArgumentException if String is not a valid token ID
 	 */
 	public static ACell parseTokenID(String caip19) {
@@ -99,7 +99,7 @@ public static ACell parseTokenID(String caip19) {
 		} catch (ParseException | IndexOutOfBoundsException e) {
 			throw new IllegalArgumentException("Invalid CAIP19 asset for Convex: "+caip19,e);
 		}
-		throw new IllegalArgumentException("Only CAD29 assets currently supported on Convex, but CAIP19 code was: "+caip19);
+		throw new IllegalArgumentException("Only CVM or CAD29 assets currently supported on Convex, but CAIP19 code was: "+caip19);
 	}
 
 	/**

convex-core/src/main/java/convex/core/util/JSONUtils.java

@@ -416,13 +416,20 @@ private static BlobBuilder appendWhitespaceString(BlobBuilder sb, long count) {
 
 	private static void appendCVMStringQuoted(BlobBuilder bb, CharSequence cs) {
 		int n = cs.length();
+		
 		for (int i = 0; i < n; i++) {
 			char c = cs.charAt(i);
 			AString rep = getReplacementString(c);
 			if (rep != null) {
 				bb.append(rep);
 			} else {
-				bb.append(c);
+				if (Character.isSurrogate(c)) {
+					int codePoint=Character.codePointAt(cs, i);
+					bb.append(CVMChar.create(codePoint));
+					i++;
+				} else {
+					bb.append(c);
+				}
 			}
 		}
 	}

convex-core/src/main/java/convex/lattice/ALattice.java

@@ -7,6 +7,8 @@
  */
 public abstract class ALattice<V extends ACell> {
 
+
+	
 	/**
 	 * Implementation of merge function
 	 * @param ownValue Own lattice value

convex-core/src/main/java/convex/lattice/MaxLattice.java

@@ -9,6 +9,10 @@
  */
 public class MaxLattice extends ALattice<AInteger> {
 
+	private MaxLattice() {
+		// private to enforce Singleton
+	}
+	
 	private static final MaxLattice INSTANCE = new MaxLattice();
 
 	@Override

convex-core/src/main/java/convex/lattice/SetLattice.java

@@ -11,6 +11,10 @@
  */
 public class SetLattice<V extends ACell> extends ALattice<ASet<V>> {
 
+	private SetLattice() {
+		// private to enforce Singleton
+	}
+	
 	private static final SetLattice<?> INSTANCE = new SetLattice<>();
 
 	@Override