Merge pull request #208 from tronprotocol/develop

Develop
tronprotocol · Nov 15, 2021 · 11d508a · 11d508a
2 parents 247a1ea + 58e00e8
commit 11d508a
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -172,6 +172,11 @@ In order to contribute you can
 
 ## Recent History
 
+__4.0.1__
+- set _isConstant as true for call method
+- ignore max feeLimit check
+- change git repository url
+
 __4.0.0__
 - support `broadcastHex` method
 - ignore fullnode version check when calling `createToken` method

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "dist/TronWeb.node.js",
     "scripts": {
@@ -81,7 +81,7 @@
             "url": "https://github.com/tron-us"
         }
     ],
-    "homepage": "https://github.com/tron-us/tronweb",
+    "homepage": "https://github.com/tronprotocol/tronweb",
     "license": "MIT",
-    "repository": "https://github.com/tron-us/tronweb.git"
+    "repository": "https://github.com/tronprotocol/tronweb.git"
 }
diff --git a/src/lib/contract/method.js b/src/lib/contract/method.js
@@ -92,6 +92,7 @@ export default class Method {
             ...this.defaultOptions,
             from: this.tronWeb.defaultAddress.hex,
             ...options,
+            _isConstant: true
         };
 
         const parameters = args.map((value, index) => ({

diff --git a/src/lib/sidechain.js b/src/lib/sidechain.js
@@ -1,7 +1,5 @@
 import injectpromise from 'injectpromise';
 import Validator from 'paramValidator';
-
-const MAX_FEE_LIMIT = 5_000_000_000;
 export default class SideChain {
     constructor(sideOptions, TronWeb = false, mainchain = false, privateKey = false) {
         this.mainchain = mainchain;
@@ -212,8 +210,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: MAX_FEE_LIMIT
+                gte: 0
             }
         ], callback)) {
             return;
@@ -268,8 +265,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: MAX_FEE_LIMIT
+                gte: 0
             },
             {
                 name: 'tokenId',
@@ -339,8 +335,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: MAX_FEE_LIMIT
+                gte: 0
             },
             {
                 name: 'contractAddress',
@@ -512,8 +507,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: MAX_FEE_LIMIT
+                gte: 0
             }
         ], callback)) {
             return;
@@ -617,8 +611,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: 1_000_000_000
+                gte: 0
             }
         ], callback)) {
             return;
@@ -680,8 +673,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: 1_000_000_000
+                gte: 0
             }
         ], callback)) {
             return;
@@ -745,8 +737,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: 1_000_000_000
+                gte: 0
             },
             {
                 name: 'contractAddress',
@@ -926,8 +917,7 @@ export default class SideChain {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gte: 0,
-                lte: 1_000_000_000
+                gte: 0
             }
         ], callback)) {
             return;

diff --git a/src/lib/transactionBuilder.js b/src/lib/transactionBuilder.js
@@ -588,8 +588,7 @@ export default class TransactionBuilder {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gt: 0,
-                lte: 5_000_000_000
+                gt: 0
             },
             {
                 name: 'callValue',
@@ -780,8 +779,7 @@ export default class TransactionBuilder {
                 name: 'feeLimit',
                 type: 'integer',
                 value: feeLimit,
-                gt: 0,
-                lte: 5_000_000_000
+                gt: 0
             },
             {
                 name: 'callValue',

diff --git a/test/lib/sidechain.test.js b/test/lib/sidechain.test.js
@@ -128,7 +128,7 @@ describe("TronWeb.sidechain", function () {
             });
 
             it('should throw if an invalid fee limit is passed', async function () {
-                const feeLimit = 10000000000
+                const feeLimit = -1
                 await assertThrow(
                     tronWeb.sidechain.depositTrc10(TOKEN_ID, 100, DEPOSIT_FEE, feeLimit),
                     'Invalid feeLimit provided'
@@ -187,7 +187,7 @@ describe("TronWeb.sidechain", function () {
 
             it('should throw if an invalid fee limit is passed', async function () {
                 const num = 100;
-                const feeLimit = 100000000000;
+                const feeLimit = -1;
                 await assertThrow(
                     tronWeb.sidechain.depositTrc20(num, DEPOSIT_FEE, feeLimit, CONTRACT_ADDRESS20),
                     'Invalid feeLimit provided'
@@ -292,7 +292,7 @@ describe("TronWeb.sidechain", function () {
         });
 
         it('should throw if an invalid fee limit is passed', async function () {
-            const feeLimit = 100000000000;
+            const feeLimit = -1;
             await assertThrow(
                 tronWeb.sidechain.mappingTrc20(HASH20, MAPPING_FEE, feeLimit),
                 'Invalid feeLimit provided'
@@ -438,7 +438,7 @@ describe("TronWeb.sidechain", function () {
             });
 
             it('should throw if an invalid fee limit is passed', async function () {
-                const feeLimit = 100000000000;
+                const feeLimit = -1;
                 await assertThrow(
                     tronWeb.sidechain.withdrawTrc10(TOKEN_ID, 100, WITHDRAW_FEE, feeLimit),
                     'Invalid feeLimit provided'
@@ -498,10 +498,14 @@ describe("TronWeb.sidechain", function () {
 
                 it('should throw if an invalid fee limit is passed', async function () {
                     const feeLimit = 100000000000;
-                    await assertThrow(
-                        tronWeb.sidechain.withdrawTrc20(100, WITHDRAW_FEE, feeLimit, ADDRESS20_MAPPING),
-                        'Invalid feeLimit provided'
-                    );
+                    const num = 10;
+                    const options = { permissionId: 0 };
+                    const txID = await tronWeb.sidechain.withdrawTrc20(num, WITHDRAW_FEE, FEE_LIMIT, ADDRESS20_MAPPING, options, PRIVATE_KEY);
+                    assert.equal(txID.length, 64);
+                    // await assertThrow(
+                    //     tronWeb.sidechain.withdrawTrc20(100, WITHDRAW_FEE, feeLimit, ADDRESS20_MAPPING),
+                    //     'Invalid feeLimit provided'
+                    // );
                 });
 
                 it('should throw if an invalid contract address is passed', async function () {

diff --git a/yarn.lock b/yarn.lock