Correct accidentally ignored inital record by slip39-generator --receive

Author: pjkundert

README.org

@@ -544,6 +544,7 @@ by entering the mnemonics right on the device.
     #+END_SRC
 
     #+RESULTS:
+    :     0: [["ETH", "m/44'/60'/0'/0/0", "0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E"], ["BTC", "m/84'/0'/0'/0/0", "bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2"]]
     :     1: [["ETH", "m/44'/60'/0'/0/1", "0xd1a7451beB6FE0326b4B78e3909310880B781d66"], ["BTC", "m/84'/0'/0'/0/1", "bc1qkd33yck74lg0kaq4tdcmu3hk4yruhjayxpe9ug"]]
     :     2: [["ETH", "m/44'/60'/0'/0/2", "0x578270B5E5B53336baC354756b763b309eCA90Ef"], ["BTC", "m/84'/0'/0'/0/2", "bc1qvr7e5aytd0hpmtaz2d443k364hprvqpm3lxr8w"]]
     :     3: [["ETH", "m/44'/60'/0'/0/3", "0x909f59835A5a120EafE1c60742485b7ff0e305da"], ["BTC", "m/84'/0'/0'/0/3", "bc1q6t9vhestkcfgw4nutnm8y2z49n30uhc0kyjl0d"]]

slip39/generator/__init__.py

@@ -96,15 +96,23 @@ def accountgroups_input(
         if not record:
             continue
 
-        # See if records are indexed.  Only int or 'nonce' is accepted for index.
+        # See if records are indexed.  Only int or 'nonce' is accepted for index.  Ignore any
+        # (strange) empty '<index>: ' records (anything possible w/ corruption on a serial link...)
         index			= None
+        payload			= ''
         try:
             index,payload	= record.split( ':', 1 )        # ValueError if not <index>:<payload>
             index		= int( index )			# ValueError if <index> not int
         except ValueError:
             if index != 'nonce':				# Otherwise, only 'nonce': <payload> acceptable
                 index,payload	= None,record			# ...if not; then records are not indexed.
 
+        payload			= payload.strip()
+        log.debug( f"Detect record {index:>5}: {payload!r}" )
+        if not payload:
+            continue
+
+        # Non-empty payload; process as either encrypted or raw JSON.
         try:
             if cipher:
                 if nonce is None or index == 'nonce':
@@ -113,7 +121,7 @@ def accountgroups_input(
                     try:
                         assert index == 'nonce', \
                             f"Failed to find 'nonce' enumeration prefix on first record: {record!r}"
-                        ciphertext	= bytearray( codecs.decode( payload.strip(), 'hex_codec' ))
+                        ciphertext	= bytearray( codecs.decode( payload, 'hex_codec' ))
                         nonce		= bytes( cipher.decrypt( b'\x00' * 12, ciphertext ))
                     except Exception as exc:
                         message		= f"Failed to recover nonce from {record!r}; cannot proceed: {exc}"
@@ -122,6 +130,7 @@ def accountgroups_input(
                     log.info( f"Decrypting accountgroups with nonce: {nonce.hex()}" )
                     continue
 
+                log.debug( f"Decrypt index {index:>5}: {payload!r}" )
                 nonce_now	= nonce_add( nonce, index )
                 ciphertext	= bytearray( bytes.fromhex( payload ))
                 plaintext 	= bytes( cipher.decrypt( nonce_now, ciphertext ))
@@ -131,6 +140,7 @@ def accountgroups_input(
             log.warning( f"Discarding invalid record {record!r}: {exc!r}" )
             yield None, None
         else:
+            log.debug( f"Decoded index {index:>5}: {group!r}" )
             yield int(index), group
 
 

slip39/generator/main.py

@@ -234,7 +234,7 @@ def healthy_reset( file ):
                 encoding	= encoding,
                 healthy		= healthy,
             ):
-                if index and group:
+                if index is not None and group:
                     accountgroups_output( group, index=index )
                     continue
                 if healthy and healthy( file ):