Merge pull request #128 from tronprotocol/develop

Develop
tronprotocol · Jan 7, 2021 · 5e5cb5a · 5e5cb5a
2 parents 32d1b1a + ecc18b8
commit 5e5cb5a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -168,6 +168,10 @@ In order to contribute you can
 
 ## Recent History
 
+__3.2.2__
+- Set feeLimit default value as 40 TRX
+- The `createToken` method supports 0 in its precision
+
 __3.1.0__
 - Update `elliptic` to the latest version 6.5.3
 - Update `ethers` to the latest version 5.0.8

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "3.1.0",
+    "version": "3.2.2",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "dist/TronWeb.node.js",
     "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -17,7 +17,7 @@ import { ADDRESS_PREFIX } from 'utils/address';
 
 const DEFAULT_VERSION = '3.5.0';
 
-const FEE_LIMIT = 20000000;
+const FEE_LIMIT = 40000000;
 
 export default class TronWeb extends EventEmitter {
     static providers = providers;

diff --git a/src/lib/transactionBuilder.js b/src/lib/transactionBuilder.js
@@ -1035,8 +1035,8 @@ export default class TransactionBuilder {
         if (utils.isNotNullOrUndefined(voteScore) && (!utils.isInteger(voteScore) || voteScore <= 0))
             return callback('voteScore must be a positive integer greater than 0');
 
-        if (utils.isNotNullOrUndefined(precision) && (!utils.isInteger(precision) || precision <= 0 || precision > 6))
-            return callback('precision must be a positive integer > 0 and <= 6');
+        if (utils.isNotNullOrUndefined(precision) && (!utils.isInteger(precision) || precision < 0 || precision > 6))
+            return callback('precision must be a positive integer >= 0 and <= 6');
 
         const data = {
             owner_address: toHex(issuerAddress),

diff --git a/test/lib/transactionBuilder.test.js b/test/lib/transactionBuilder.test.js
@@ -206,6 +206,18 @@ describe('TronWeb.transactionBuilder', function () {
             }
         });
 
+        it(`should create a TestToken passing with precision is zero`, async function () {
+            const options = getTokenOptions();
+            options.precision = 0
+            for (let i = 0; i < 2; i++) {
+                if (i === 1) options.permissionId = 2;
+                const transaction = await tronWeb.transactionBuilder.createToken(options);
+                const parameter = txPars(transaction);
+                await assertEqualHex(parameter.value.abbr, options.abbreviation);
+                assert.equal(transaction.raw_data.contract[0].Permission_id || 0, options.permissionId || 0);
+            }
+        });
+
         it(`should create a TestToken without freezing anything in 3.6.0`, async function () {
             if (tronWeb.fullnodeSatisfies('^3.6.0')) {
                 const options = getTokenOptions();
@@ -1159,7 +1171,7 @@ describe('TronWeb.transactionBuilder', function () {
                 const tx = await tronWeb.transactionBuilder.createSmartContract(options)
                 assert.equal(tx.raw_data.contract[0].parameter.value.new_contract.consume_user_resource_percent, 100);
                 assert.equal(tx.raw_data.contract[0].parameter.value.new_contract.origin_energy_limit, 1e7);
-                assert.equal(tx.raw_data.fee_limit, 2e7);
+                assert.equal(tx.raw_data.fee_limit, 4e7);
                 assert.equal(tx.raw_data.contract[0].Permission_id || 0, options.permissionId || 0);
             }
         });