Merge pull request #132 from tronprotocol/develop

Develop

Author: unicornonea

README.md

@@ -168,6 +168,10 @@ In order to contribute you can
 
 ## Recent History
 
+__3.2.3__
+- Support triggerSmartContract function with empty character functionSelector and empty array parameters
+- The triggerSmartContract function Support for anonymous contract parameter incoming
+
 __3.2.2__
 - Set feeLimit default value as 40 TRX
 - The `createToken` method supports 0 in its precision

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "dist/TronWeb.node.js",
     "scripts": {

src/lib/transactionBuilder.js

@@ -811,58 +811,60 @@ export default class TransactionBuilder {
                 value: tokenId,
                 gte: 0,
                 optional: true
-            },
-            {
-                name: 'function selector',
-                type: 'not-empty-string',
-                value: functionSelector
             }
         ], callback))
             return;
 
-        functionSelector = functionSelector.replace('/\s*/g', '');
+        const args = {
+            contract_address: toHex(contractAddress),
+            owner_address: toHex(issuerAddress)
+        };
 
-        if (parameters.length) {
-            const abiCoder = new AbiCoder();
-            let types = [];
-            const values = [];
+        if (functionSelector && utils.isString(functionSelector)) {
+            functionSelector = functionSelector.replace('/\s*/g', '');
+            if (parameters.length) {
+                const abiCoder = new AbiCoder();
+                let types = [];
+                const values = [];
 
-            for (let i = 0; i < parameters.length; i++) {
-                let {type, value} = parameters[i];
+                for (let i = 0; i < parameters.length; i++) {
+                    let {type, value} = parameters[i];
 
-                if (!type || !utils.isString(type) || !type.length)
-                    return callback('Invalid parameter type provided: ' + type);
+                    if (!type || !utils.isString(type) || !type.length)
+                        return callback('Invalid parameter type provided: ' + type);
 
-                if (type == 'address')
-                    value = toHex(value).replace(ADDRESS_PREFIX_REGEX, '0x');
-                else if (type == 'address[]')
-                    value = value.map(v => toHex(v).replace(ADDRESS_PREFIX_REGEX, '0x'));
+                    if (type == 'address')
+                        value = toHex(value).replace(ADDRESS_PREFIX_REGEX, '0x');
+                    else if (type == 'address[]')
+                        value = value.map(v => toHex(v).replace(ADDRESS_PREFIX_REGEX, '0x'));
 
-                types.push(type);
-                values.push(value);
-            }
+                    types.push(type);
+                    values.push(value);
+                }
 
-            try {
-                // workaround for unsupported trcToken type
-                types = types.map(type => {
-                    if (/trcToken/.test(type)) {
-                        type = type.replace(/trcToken/, 'uint256')
-                    }
-                    return type
-                })
+                try {
+                    // workaround for unsupported trcToken type
+                    types = types.map(type => {
+                        if (/trcToken/.test(type)) {
+                            type = type.replace(/trcToken/, 'uint256')
+                        }
+                        return type
+                    })
+
+                    parameters = abiCoder.encode(types, values).replace(/^(0x)/, '');
+                } catch (ex) {
+                    return callback(ex);
+                }
+            } else parameters = '';
 
-                parameters = abiCoder.encode(types, values).replace(/^(0x)/, '');
-            } catch (ex) {
-                return callback(ex);
+            if(options.shieldedParameter){
+                parameters = options.shieldedParameter.replace(/^(0x)/, '');
             }
-        } else parameters = '';
 
-        const args = {
-            contract_address: toHex(contractAddress),
-            owner_address: toHex(issuerAddress),
-            function_selector: functionSelector,
-            parameter: parameters
-        };
+            args.function_selector = functionSelector;
+            args.parameter = parameters;
+        }
+
 
         if (!options._isConstant) {
             args.call_value = parseInt(callValue)