Merge commit '93fa6855afad7a7eb86e49efe384372a6060da35' into natspec

libjsqrc/ethereumjs/dist/ethereum.js

@@ -488,22 +488,24 @@ var contract = function (address, desc) {
             options.to = address;
             options.data = signature + parsed;
             
-            var output = "";
+            var isTransact = result._isTransact;
-            if (result._isTransact) {
+            
+            // reset
+            result._options = {};
+            result._isTransact = false;
+
+            if (isTransact) {
                 // it's used byt natspec.js
                 // TODO: figure out better way to solve this
                 web3._currentContractAbi = desc;
                 web3._currentContractAddress = address;
 
-                output = web3.eth.transact(options);
+                // transactions do not have any output, cause we do not know, when they will be processed
-            } else {
+                web3.eth.transact(options);
-                output = web3.eth.call(options);
+                return;
             }
             
-            // reset
+            var output = web3.eth.call(options);
-            result._options = {};
-            result._isTransact = false;
-
             return outputParser[displayName][typeName](output);
         };
 

libjsqrc/ethereumjs/lib/contract.js

@@ -77,22 +77,24 @@ var contract = function (address, desc) {
             options.to = address;
             options.data = signature + parsed;
             
-            var output = "";
+            var isTransact = result._isTransact;
-            if (result._isTransact) {
+            
+            // reset
+            result._options = {};
+            result._isTransact = false;
+
+            if (isTransact) {
                 // it's used byt natspec.js
                 // TODO: figure out better way to solve this
                 web3._currentContractAbi = desc;
                 web3._currentContractAddress = address;
 
-                output = web3.eth.transact(options);
+                // transactions do not have any output, cause we do not know, when they will be processed
-            } else {
+                web3.eth.transact(options);
-                output = web3.eth.call(options);
+                return;
             }
             
-            // reset
+            var output = web3.eth.call(options);
-            result._options = {};
-            result._isTransact = false;
-
             return outputParser[displayName][typeName](output);
         };