Merge pull request #677 from tronprotocol/release/v6.1.1

Release/v6.1.1

Author: unicornonea

CHANGELOG.md

@@ -1,6 +1,14 @@
 Change Log
 =========
 
+__6.1.1__
+
+## Changes
+
+- Remove dependency `jsonwebtoken`.
+- Bump `validator` from v13.15.20 to v13.15.23.
+- Address other audit issues.
+
 __6.1.0__
 
 ## New Features

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "./lib/commonjs/index.js",
     "module": "./lib/esm/index.js",
@@ -65,7 +65,7 @@
         "eventemitter3": "5.0.1",
         "google-protobuf": "3.21.4",
         "semver": "7.7.1",
-        "validator": "13.15.20"
+        "validator": "13.15.23"
     },
     "devDependencies": {
         "@babel/core": "7.26.10",
@@ -103,7 +103,6 @@
         "globby": "14.1.0",
         "husky": "9.1.7",
         "json-schema": "0.4.0",
-        "jsonwebtoken": "9.0.2",
         "karma": "6.4.4",
         "karma-chrome-launcher": "3.2.0",
         "karma-coverage": "2.2.1",

package.json

@@ -22,7 +22,7 @@ const DEFAULT_VERSION = '4.7.1';
 
 const FEE_LIMIT = 150000000;
 
-const version = '6.1.0';
+const version = '6.1.1';
 
 function isValidOptions(options: unknown): options is TronWebOptions {
     return (

src/tronweb.ts

@@ -42,8 +42,16 @@ describe('#contract.index', function () {
 
         it('should revert with custom error', async () => {
             const txid = await customError.test(111).send();
-            await wait(10);
-            const data = await tronWeb.trx.getTransactionInfo(txid);
+            let data;
+            while (true) {
+                data = await tronWeb.trx.getTransactionInfo(txid);
+                if (Object.keys(data).length === 0) {
+                    await wait(3);
+                    continue;
+                } else {
+                    break;
+                }
+            }
             const errorData = data.contractResult;
             const expectedErrorData =
                 TronWeb.sha3('CustomError(uint256,uint256)', false).slice(0, 8) +

test/lib/contract/index.test.ts

@@ -176,25 +176,18 @@ describe('TronWeb.transactionBuilder', function () {
             );
         });
 
-        it('should send 10 sun from default address to accounts[1] for more than 2 times in one block', async function () {
-            let firstBlockNum = '';
-            let loopTimes = 0;
-            for (let i = 0; i < 100; i++) {
-                loopTimes++;
-                const txHeader = await tronWeb.trx.getCurrentRefBlockParams();
-                txHeader.timestamp += new Date().getMilliseconds(); // to avoid txID duplication
+        it('should send 10 sun from default address to accounts[1] for 10 times in one block', async function () {
+            const curTime = Date.now();
+            const txHeader = await tronWeb.trx.getCurrentRefBlockParams();
+            const originTimestamp = txHeader.timestamp;
+            for (let i = 0; i < 10; i++) {
+                // to avoid txID duplication
+                txHeader.timestamp = originTimestamp + Date.now() - curTime;
                 const res = await broadcaster(
                     tronWeb.transactionBuilder.sendTrx(accounts.b58[1], 10, undefined, { blockHeader: txHeader })
                 );
-                if (firstBlockNum === '') {
-                    firstBlockNum = res.transaction.raw_data.ref_block_bytes;
-                } else {
-                    if (firstBlockNum !== res.transaction.raw_data.ref_block_bytes) break;
-                }
-
                 assert.isTrue(res.receipt.result);
             }
-            assert.isAtLeast(loopTimes, 2, 'loopTimes is less than 2 times, should rerun');
         });
     });
 
@@ -2355,8 +2348,8 @@ describe('TronWeb.transactionBuilder', function () {
 
             const params = [
                 [transactions[0], accounts.hex[7], { permissionId: 2 }],
-                [transactions[1], accounts.hex[7]],
                 [transactions[2], accounts.hex[7], { blockHeader: await tronWeb.trx.getCurrentRefBlockParams() }],
+                [transactions[1], accounts.hex[7]],
             ];
             for (const param of params) {
                 const contractAddress = param[0].contract_address;
@@ -2518,12 +2511,11 @@ describe('TronWeb.transactionBuilder', function () {
             const functionSelector = 'store(uint256)';
             const parameter = [{ type: 'uint256', value: 1 }];
             const options: TriggerConstantContractOptions = {};
-            let firstBlockNum = '';
-            let loopTimes = 0;
-            for (let i = 0; i < 100; i++) {
-                loopTimes++;
-                const txHeader = await tronWeb.trx.getCurrentRefBlockParams();
-                txHeader.timestamp += new Date().getMilliseconds();
+            const curTime = Date.now();
+            const txHeader = await tronWeb.trx.getCurrentRefBlockParams();
+            const originTimestamp = txHeader.timestamp;
+            for (let i = 0; i < 10; i++) {
+                txHeader.timestamp = originTimestamp + Date.now() - curTime; // ensure unique timestamp
                 options.blockHeader = txHeader;
                 const tx = await tronWeb.transactionBuilder.triggerSmartContract(
                     contractAddress,
@@ -2532,15 +2524,9 @@ describe('TronWeb.transactionBuilder', function () {
                     parameter,
                     issuerAddress
                 );
-                if (firstBlockNum === '') {
-                    firstBlockNum = tx.transaction.raw_data.ref_block_bytes;
-                } else {
-                    if (firstBlockNum !== tx.transaction.raw_data.ref_block_bytes) break;
-                }
                 const { receipt } = await broadcaster(null, accounts.pks[6], tx.transaction);
                 assert.isTrue(receipt.result);
             }
-            assert.isAtLeast(loopTimes, 2, 'loopTimes is less than 2 times, should rerun');
         });
     });