Merge pull request #111 from tronprotocol/develop

Develop
tronprotocol · Sep 28, 2020 · f64f390 · f64f390
2 parents 97b5529 + 947146e
commit f64f390
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -168,6 +168,11 @@ In order to contribute you can
 
 ## Recent History
 
+__3.1.0__
+- Update `elliptic` to the latest version 6.5.3
+- Update `ethers` to the latest version 5.0.8
+- Fix `loadAbi()`
+
 __3.0.0__
 - Support sidechain for SunNetwork
 - Set feeLimit default value as 20 TRX

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "dist/TronWeb.node.js",
     "scripts": {
@@ -25,8 +25,8 @@
         "axios": "^0.19.0",
         "babel-runtime": "^6.26.0",
         "bignumber.js": "^7.2.1",
-        "elliptic": "^6.4.1",
-        "ethers": "^4.0.7",
+        "elliptic": "^6.5.3",
+        "ethers": "^5.0.8",
         "eventemitter3": "^3.1.0",
         "injectpromise": "^1.0.0",
         "lodash": "^4.17.14",

diff --git a/src/lib/contract/index.js b/src/lib/contract/index.js
@@ -202,7 +202,7 @@ export default class Contract {
             this.bytecode = contract.bytecode;
             this.deployed = true;
 
-            this.loadAbi(contract.abi ? contract.abi.entrys : []);
+            this.loadAbi(contract.abi ? contract.abi.entrys ? contract.abi.entrys : [] : []);
 
             return callback(null, this);
         } catch (ex) {

diff --git a/src/lib/trx.js b/src/lib/trx.js
@@ -710,22 +710,25 @@ export default class Trx {
 
     static signString(message, privateKey, useTronHeader = true) {
         message = message.replace(/^0x/, '');
-        const signingKey = new SigningKey(privateKey);
+        const value ={
+            toHexString: function() {
+                return '0x' + privateKey
+            },
+            value: privateKey
+        }
+        const signingKey = new SigningKey(value);
         const messageBytes = [
             ...toUtf8Bytes(useTronHeader ? TRX_MESSAGE_HEADER : ETH_MESSAGE_HEADER),
             ...utils.code.hexStr2byteArray(message)
         ];
-
         const messageDigest = keccak256(messageBytes);
         const signature = signingKey.signDigest(messageDigest);
-
         const signatureHex = [
             '0x',
             signature.r.substring(2),
             signature.s.substring(2),
             Number(signature.v).toString(16)
         ].join('');
-
         return signatureHex
     }
 

diff --git a/test/lib/transactionBuilder.test.js b/test/lib/transactionBuilder.test.js
@@ -1159,7 +1159,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, 1e9);
+                assert.equal(tx.raw_data.fee_limit, 2e7);
                 assert.equal(tx.raw_data.contract[0].Permission_id || 0, options.permissionId || 0);
             }
         });

diff --git a/test/utils/abi.test.js b/test/utils/abi.test.js
@@ -56,10 +56,9 @@ describe('TronWeb.utils.abi', function () {
             const types = ['string', 'string', 'uint8', 'bytes32', 'uint256'];
             const output =
                 '00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000012dc03b7993bad736ad595eb9e3ba51877ac17ecc31d2355f8f270125b9427ece700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011506920446179204e30306220546f6b656e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000035049450000000000000000000000000000000000000000000000000000000000';
-
             assert.throws(() => {
                 tronWeb.utils.abi.decodeParams(types, output)
-            }, 'hex string must have 0x prefix');
+            }, 'invalid arrayify value');
         });
 
         it('should throw if the output format is wrong', function () {
@@ -70,7 +69,7 @@ describe('TronWeb.utils.abi', function () {
 
             assert.throws(() => {
                 tronWeb.utils.abi.decodeParams(types, output)
-            }, 'dynamic bytes count too large');
+            }, 'overflow');
         });
 
         it('should throw if the output is invalid', function () {