ARMORY-531

goatpig · goatpig · commit aa6a63fca9aa · 2015-09-15T19:36:23.000+02:00
diff --git a/armoryengine/UserAddressUtils.py b/armoryengine/UserAddressUtils.py
@@ -281,6 +281,8 @@ def truncateStr(theStr, maxLen):
          dispStr += ' [%s]' % addrStr
       elif len(dispStr) + lastTrunc + 6 <= maxChars:
          dispStr += ' [%s...]' % addrStr[:lastTrunc]
+   elif len(binScript) == 0:
+      dispStr = 'Unknown Input' 
    else:
       addrStr = script_to_addrStr(script_to_p2sh_script(binScript))
       dispStr = 'Non-Standard: %s' % addrStr
diff --git a/armorymodels.py b/armorymodels.py
@@ -1260,7 +1260,9 @@ def __init__(self,  pytx, txinListFromBDM=None, main=None):
             self.dispTable[-1].append(binary_to_hex(hsh))
             self.dispTable[-1].append(idx)
             self.dispTable[-1].append(blk)
-            if ustx is None:
+            if len(script) == 0:
+               self.dispTable[-1].append("") 
+            elif ustx is None:
                self.dispTable[-1].append(CPP_TXIN_SCRIPT_NAMES[scrType])
             else:
                isSigned = ustx.ustxInputs[i].evaluateSigningStatus().allSigned
diff --git a/cppForSwig/BlockWriteBatcher.cpp b/cppForSwig/BlockWriteBatcher.cpp
@@ -130,7 +130,6 @@ StoredTxOut* BlockWriteBatcher::lookForUTXOInMap(const BinaryData& txHash,
 void BlockWriteBatcher::resetSshHeader(
    StoredScriptHistory& ssh, const BinaryData& uniqKey) const
 {
-   //iface_->getStoredScriptHistorySummary(ssh, uniqKey);
    ssh.uniqueKey_ = uniqKey;
    ssh.alreadyScannedUpToBlk_ = 0;
    ssh.totalTxioCount_ = 0;

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ StoredTxOut* BlockWriteBatcher::lookForUTXOInMap(const BinaryData& txHash,`
`130`	`130`	`void BlockWriteBatcher::resetSshHeader(`
`131`	`131`	`StoredScriptHistory& ssh, const BinaryData& uniqKey) const`
`132`	`132`	`{`
`133`		`- //iface_->getStoredScriptHistorySummary(ssh, uniqKey);`
`134`	`133`	`ssh.uniqueKey_ = uniqKey;`
`135`	`134`	`ssh.alreadyScannedUpToBlk_ = 0;`
`136`	`135`	`ssh.totalTxioCount_ = 0;`