From 113a3809ab5e92cd0d60a02a5752b260a9ab3331 Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Sat, 24 Jan 2015 18:23:39 -0800
Subject: Fix string outputs. Auto collapse for < 2 returns.

---
 lib/abi.js      |  2 +-
 lib/contract.js | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/abi.js b/lib/abi.js
index 1dc662152..177a146b0 100644
--- a/lib/abi.js
+++ b/lib/abi.js
@@ -251,7 +251,7 @@ var formatOutputAddress = function (value) {
 };
 
 var dynamicBytesLength = function (type) {
-    if (arrayType(type) || prefixedType('string')(type))
+    if (arrayType(type) || type == 'string')   // only string itself that is dynamic; stringX is static length.
         return ETH_PADDING * 2;
     return 0;
 };
diff --git a/lib/contract.js b/lib/contract.js
index ecabc87fa..418f87df7 100644
--- a/lib/contract.js
+++ b/lib/contract.js
@@ -90,6 +90,7 @@ var contract = function (address, desc) {
             options.data = signature + parsed;
             
             var isTransact = result._isTransact === true || (result._isTransact !== false && !method.constant);
+            var collapse = options.collapse !== false;
             
             // reset
             result._options = {};
@@ -107,7 +108,15 @@ var contract = function (address, desc) {
             }
             
             var output = web3.eth.call(options);
-            return outputParser[displayName][typeName](output);
+            var ret = outputParser[displayName][typeName](output);
+            if (collapse)
+            {
+                if (ret.length == 1)
+                    ret = ret[0];
+                else if (ret.length == 0)
+                    ret = null;
+            }
+            return ret;
         };
 
         if (result[displayName] === undefined) {
-- 
cgit v1.2.3