WIP transaction signer tool

Author: mikera

convex-gui/src/main/java/convex/gui/components/account/AddressField.java

@@ -33,25 +33,80 @@ public class AddressDocument extends PlainDocument {
 		@Override
 		public void insertString(int offset, String s, AttributeSet a) throws BadLocationException {
 			if (s == null) return;
+			if (s.isEmpty()) return;
 
-			char[] cs = s.toCharArray();
-			int n=cs.length;
-			if (n==0) return;
-			
-			if ((offset>0)&&(cs[0]=='#')) {
-				super.remove(0, offset);
-				offset=0;
+			// Typing '#' at any point resets the field to just '#'
+			if ("#".equals(s)) {
+				super.remove(0, getLength());
+				super.insertString(0, "#", a);
+				// Caret after '#'
+				AddressField.this.setCaretPosition(1);
+				return;
+			}
+
+			// Compose the prospective new text
+			String current = getText(0, getLength());
+			StringBuilder sb = new StringBuilder(current);
+			sb.insert(offset, s);
+			String preText = sb.toString();
+
+			// If we have any content, ensure it starts with '#'
+			String newText = preText;
+			boolean addedHash = false;
+			if (!newText.isEmpty() && newText.charAt(0) != '#') {
+				newText = "#" + newText;
+				addedHash = true;
 			}
 
-			for (int i = 0; i < n; i++ ) {
-				char c=cs[i];
-				if (Text.isASCIIDigit(c)) continue;
-				if ((offset==0)&&(i==0)&&(c=='#')) continue;
-				return; // not valid so exit function early
+			// Validate: either "#" or "#" followed only by ASCII digits
+			boolean ok = false;
+			if (newText.equals("#")) {
+				ok = true;
+			} else if ((newText.length() > 1) && (newText.charAt(0) == '#')) {
+				ok = true;
+				for (int i = 1; i < newText.length(); i++) {
+					if (!Text.isASCIIDigit(newText.charAt(i))) {
+						ok = false;
+						break;
+					}
+				}
 			}
+			if (!ok) return; // reject invalid edits
+
+			// Apply validated text
+			super.remove(0, getLength());
+			super.insertString(0, newText, a);
 
-			// Everything valid, so just insert as normal
-	    	super.insertString(offset, s, a);
+			// Place caret where user expects it: after inserted text
+			int caretPos = offset + s.length() + (addedHash ? 1 : 0);
+			if (caretPos > newText.length()) caretPos = newText.length();
+			if (caretPos < 0) caretPos = 0;
+			AddressField.this.setCaretPosition(caretPos);
+		}
+		
+		@Override
+		public void remove(int offs, int len) throws BadLocationException {
+			super.remove(offs, len);
+			
+			String text = getText(0, getLength());
+			
+			// Don't allow the field to become completely empty: reset to "#"
+			if (text.isEmpty()) {
+				super.insertString(0, "#", null);
+				AddressField.this.setCaretPosition(1);
+				return;
+			}
+			
+			// Ensure first character is always '#'
+			if (text.charAt(0) != '#') {
+				text = "#" + text;
+				super.remove(0, getLength());
+				super.insertString(0, text, null);
+				// Try to keep caret just after '#'
+				int caretPos = 1;
+				if (caretPos > text.length()) caretPos = text.length();
+				AddressField.this.setCaretPosition(caretPos);
+			}
 		}
 	}
 }

convex-gui/src/main/java/convex/gui/tools/HackerTools.java

@@ -56,6 +56,8 @@ public static void main(String[] args) throws TimeoutException {
 
 	private MessageFormatPanel messagePanel;
 
+	private SignerPanel signerPanel;
+	
 	private DLFSPanel dataPanel=new DLFSPanel(DLFS.createLocal());
 
 	/**
@@ -69,11 +71,13 @@ public HackerTools() {
 
 		keyGenPanel = new KeyGenPanel(null);
 		messagePanel = new MessageFormatPanel();
+		signerPanel = new SignerPanel();
 		this.add(tabs, BorderLayout.CENTER);
 
 		tabs.add("KeyGen", keyGenPanel);
 		tabs.add("KeyRing", new KeyRingPanel());
 		tabs.add("Encoding", messagePanel);
+		tabs.add("Signer", signerPanel);
 		tabs.add("Data Lattice", dataPanel);
 		tabs.add("System Info", new SystemInfoPanel());