Merge pull request #151 from tronprotocol/develop

Develop

Author: unicornonea

README.md

@@ -117,14 +117,15 @@ Supposing you are using a server which provides everything, like TronGrid, you c
 ```js
 const tronWeb = new TronWeb({
     fullHost: 'https://api.trongrid.io',
+    headers: { "TRON-PRO-API-KEY": 'your api key' },
     privateKey: 'your private key'
 })
 ```
 
 For retro-compatibility, though, you can continue to use the old approach, where any parameter is passed separately:
 ```js
 const tronWeb = new TronWeb(fullNode, solidityNode, eventServer, privateKey)
-
+tronWeb.setHeader({ "TRON-PRO-API-KEY": 'your api key' });
 ```
 
 If you are, for example, using a server as full and solidity node, and another server for the events, you can set it as:
@@ -168,6 +169,9 @@ In order to contribute you can
 
 ## Recent History
 
+__3.2.6__
+- Add setHeader function
+
 __3.2.5__
 - Set feeLimit max value as 5000 TRX
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "3.2.5",
+    "version": "3.2.6",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "dist/TronWeb.node.js",
     "scripts": {
@@ -22,13 +22,14 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "axios": "^0.19.0",
+        "axios": "^0.21.1",
         "babel-runtime": "^6.26.0",
         "bignumber.js": "^7.2.1",
         "elliptic": "^6.5.3",
         "ethers": "^5.0.8",
         "eventemitter3": "^3.1.0",
         "injectpromise": "^1.0.0",
+        "jsonwebtoken": "^8.5.1",
         "lodash": "^4.17.14",
         "semver": "^5.6.0",
         "validator": "^10.7.1"

src/index.js

@@ -36,12 +36,16 @@ export default class TronWeb extends EventEmitter {
         super();
 
         let fullNode;
+        let headers = false;
+        let eventHeaders = false;
 
         if (typeof options === 'object' && (options.fullNode || options.fullHost)) {
             fullNode = options.fullNode || options.fullHost;
             sideOptions = solidityNode;
             solidityNode = options.solidityNode || options.fullHost;
             eventServer = options.eventServer || options.fullHost;
+            headers = options.headers || false;
+            eventHeaders = options.eventHeaders || headers;
             privateKey = options.privateKey;
         } else {
             fullNode = options;
@@ -95,6 +99,14 @@ export default class TronWeb extends EventEmitter {
         this.fullnodeVersion = DEFAULT_VERSION;
         this.feeLimit = FEE_LIMIT;
         this.injectPromise = injectpromise(this);
+
+        if (headers) {
+            this.setFullNodeHeader(headers);
+        }
+
+        if (eventHeaders) {
+            this.setEventHeader(eventHeaders);
+        }
     }
 
     async getFullnodeVersion() {
@@ -187,6 +199,29 @@ export default class TronWeb extends EventEmitter {
         this.event.setServer(...params)
     }
 
+    setHeader (headers = {}) {
+        const fullNode = new providers.HttpProvider(this.fullNode.host, 30000, false, false, headers);
+        const solidityNode = new providers.HttpProvider(this.solidityNode.host, 30000, false, false, headers);
+        const eventServer = new providers.HttpProvider(this.eventServer.host, 30000, false, false, headers);
+
+        this.setFullNode(fullNode);
+        this.setSolidityNode(solidityNode);
+        this.setEventServer(eventServer);
+    }
+
+    setFullNodeHeader (headers = {}) {
+        const fullNode = new providers.HttpProvider(this.fullNode.host, 30000, false, false, headers);
+        const solidityNode = new providers.HttpProvider(this.solidityNode.host, 30000, false, false, headers);
+
+        this.setFullNode(fullNode);
+        this.setSolidityNode(solidityNode);
+    }
+
+    setEventHeader (headers = {}) {
+        const eventServer = new providers.HttpProvider(this.eventServer.host, 30000, false, false, headers);
+        this.setEventServer(eventServer);
+    }
+
     currentProviders() {
         return {
             fullNode: this.fullNode,

src/utils/ethersUtils.js

@@ -1,9 +1,9 @@
-
-import {utils} from 'ethers';
+import { utils } from "ethers";
 
 const keccak256 = utils.keccak256;
 const sha256 = utils.sha256;
 const toUtf8Bytes = utils.toUtf8Bytes;
+const toUtf8String = utils.toUtf8String;
 const recoverAddress = utils.recoverAddress;
 const SigningKey = utils.SigningKey;
 const AbiCoder = utils.AbiCoder;
@@ -12,7 +12,8 @@ export {
     keccak256,
     sha256,
     toUtf8Bytes,
+    toUtf8String,
     recoverAddress,
     SigningKey,
-    AbiCoder
-}
+    AbiCoder,
+};

test/helpers/config.js

@@ -17,6 +17,38 @@ module.exports = {
         freeBandwidth: 10,
         freeBandwidthLimit: 100
     },
+    TEST_TRON_GRID_API: 'http://47.252.84.138:29086',
+    TEST_TRON_HEADER_API_KEY: 'be815f09-e30f-4b98-b84d-0bb41f0708fd',
+    TEST_TRON_HEADER_API_JWT_KEY: '95057b57-a2bd-4bd5-9337-5b52cb2b3bc2',
+    TEST_TRON_HEADER_JWT_ID: '2b3b8c99254f48ef90be2dee387fe7b6',
+    TEST_TRON_HEADER_JWT_PRIVATE_KEY: `-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAuU+RD27l1tYdSnjiySnqUjTkuHguJq21+nS+oYIqiwHXLQot
+AC9vriP5sOXJ9w1SmWvj5JOmO2qYFxyO+zluW2vfPphXB2jPD0Fv2Cl/Cdef/SCg
+UR+KtGjMDudR/xgJcm9nZQ7pXcSi5rBXxQ9oIcLDxyU2wwXkGR9hJyIwqLkaP7nK
+Ce5zoE3C26uVikVC2szjjF1I70tXtlHtdhkM8DaZeNhcKc8zV7Ge5hr/9tQIjH4t
+RYKa1ldANlcEyzwQPGrsHM5KuurWQSjjLIl6JrPy9mYPbrU51KUcIwuOWPz+UcCX
+KZZMFXJNlYiZelYlAIFHRXpgvV7HFqDuLkc30wIDAQABAoIBAQCjAzZVQDXZZiMA
+JxVA5qllRXhKOhZHGhpyRw6G3w1zmNvjmAb8Gb6Bjs4QaiPfOw4FPl6L7cKWk+9U
+rV+t6diFfYA1/SbZsr4q6mJr4h0J2G+56WB93GRUzbdsCNsdrtRooU1wHcz2Gos+
+qbOb+zCcOkukvLzOlDkSTINXPIFXeXPp3ccvz6a58dwUCpvS5fw50Jl6FBhCaGcv
+t4k9dmKa/EUeMVgfZ6lwzMHm7tlp+KubHAvESr+KT+jvk2g/eTosUM+jvp1prFct
+TQgEyVeC6beXPgzvRb3Ao7C0w+N9VYwst4LoH9rHrtsROTpKsKvpUA+T2fhN6RaB
+GVYQuVEJAoGBAPNWxFDBRvaUO7j0ipQDzEhn1J7jHhq/zofCAv6YqWbFZUiM3Z+4
+WZJIUy6JyKPhg7UPSwlJtwIygO8EzlDIr8cKGh8vxy2cP4KUI/zOZfx8Y19x/vz/
+eEF+0kMz0qIf2JiWnG94nC/JzqQ6IIjHaPYXimz2DfkiTBCiBPoDoh+FAoGBAMLz
+4AISOSFlkiJRNbDCTOogbQaX0voYlt3aRBXIGeOgcodI8adjLOGDFDMFUL8Kdxke
+l3zhkmBlbHw9+q7a5GDd03i+n5CSZQDMuljAb8lUm36MnV6sGMnlCX2mGQjHdwLI
+Kql9NwoK5fNcvwjqQogbTnXLkaIecaUES8eTHp13AoGATEHyv8PyMy/9D1dDXmNa
+T46KaUiPlJ5rYMwCGDtLSzOtK/FJOtaQ63DS8JCpWgJAPiuOvlhli8C7+yusZFCg
+FWYrDX7xkm+Wz5sRNBaSi2+HzM9ys2J0E0JlLj49UiVcwWThnWVUvP0nTvwQWgzz
+7bsu3Dq34k1HPScpHBirY+kCgYEAoSRqJewgMv289AbCZW/FmcThuZBnQHhww8J1
+greaxq9J248syBpO77ykRqP/IVoqJaZGu1/M2Ucci/nDKyMdoP/am7SdOif3uth+
+s3ulKvp3aPwb3DRObRuXY7eWe848Dh2cPeqVQwTNHAKumVThV5WSngV9RE77ytWp
+ObbemHMCgYEAmlnWvwed2VkRiHpPV7VcFP7NCz6c+WCgRH9gca//fFLPzxB6dwsz
+vvQ4W6Hmeyh9ef/dGQRPKwBp2oiJELouIVybtc2S2wT3DYm2AgYv4RFcH3CB2cIW
+Djyb5403LJztsxdExbyQkm++Gg631CZus4xA77wMafGw37IhCE6sTBo=
+-----END RSA PRIVATE KEY-----`,
+
     getTokenOptions: () => {
         const rnd = Math.random().toString(36).substr(2);
         return {