Merge pull request ethereum#1000 from eswarasai/master

Initial commit to allow hex encoded transaction param
bmcd · Jan 29, 2018 · 6c628a5 · 6c628a5
2 parents 5e5a04c + d490708
commit 6c628a5
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/app/execution/txFormat.js b/src/app/execution/txFormat.js
@@ -47,28 +47,34 @@ module.exports = {
     */
   buildData: function (contractName, contract, contracts, isConstructor, funAbi, params, udapp, callback, callbackStep) {
     var funArgs = ''
-    try {
-      funArgs = $.parseJSON('[' + params + ']')
-    } catch (e) {
-      callback('Error encoding arguments: ' + e)
-      return
-    }
     var data = ''
     var dataHex = ''
-    if (!isConstructor || funArgs.length > 0) {
+
+    if (params.indexOf('0x') === 0) {
+      dataHex = params.replace('0x', '')
+      data = Buffer.from(dataHex, 'hex')
+    } else {
       try {
-        data = helper.encodeParams(funAbi, funArgs)
-        dataHex = data.toString('hex')
+        funArgs = $.parseJSON('[' + params + ']')
       } catch (e) {
         callback('Error encoding arguments: ' + e)
         return
       }
-    }
-    if (data.slice(0, 9) === 'undefined') {
-      dataHex = data.slice(9)
-    }
-    if (data.slice(0, 2) === '0x') {
-      dataHex = data.slice(2)
+      if (!isConstructor || funArgs.length > 0) {
+        try {
+          data = helper.encodeParams(funAbi, funArgs)
+          dataHex = data.toString('hex')
+        } catch (e) {
+          callback('Error encoding arguments: ' + e)
+          return
+        }
+      }
+      if (data.slice(0, 9) === 'undefined') {
+        dataHex = data.slice(9)
+      }
+      if (data.slice(0, 2) === '0x') {
+        dataHex = data.slice(2)
+      }
     }
     var contractBytecode
     if (isConstructor) {