Merge pull request #534 from start940315/release/v6.0.0

Release/v6.0.0

Author: unicornonea

CHANGELOG.md

@@ -1,6 +1,13 @@
 Change Log
 =========
 
+__6.0.0-beta.4__
+- Replace `ethers@v5/abi` with abiCoder of `ethers@v6`.
+- Bump ethers from v6.11.1 to v6.13.1.
+- Export all Types and enum objects.
+- Move `typescript` and other dev dependencies into `devDependencies` field in package.json.
+- Change headers type in TronWeb constructor.
+
 __6.0.0-beta.3__
 - Support recovering transaction signer address by `trx.ecRecover`.
 - Support both base58 format and hex format address field in keys of `updateAccountPermissions` params.

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "tronweb",
-    "version": "6.0.0-beta.3",
+    "version": "6.0.0-beta.4",
     "description": "JavaScript SDK that encapsulates the TRON HTTP API",
     "main": "./lib/commonjs/index.js",
     "module": "./lib/esm/index.js",
@@ -58,19 +58,13 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.0.0",
-        "@ethersproject/abi": "^5.7.0",
         "@tronweb3/google-protobuf": "^3.21.2",
         "axios": "^1.6.8",
         "bignumber.js": "^9.0.1",
-        "eslint-config-prettier": "^8.8.0",
         "ethereum-cryptography": "^2.1.3",
-        "ethers": "^6.11.1",
+        "ethers": "^6.13.1",
         "eventemitter3": "^3.1.0",
-        "events": "^3.3.0",
-        "injectpromise": "^1.0.0",
-        "querystring-es3": "^0.2.1",
         "semver": "^5.6.0",
-        "typescript": "^5.1.6",
         "validator": "^13.7.0"
     },
     "devDependencies": {
@@ -99,7 +93,9 @@
         "chai": "^4.3.7",
         "chalk": "^2.4.1",
         "eslint": "^8.44.0",
+        "eslint-config-prettier": "^8.8.0",
         "eslint-import-resolver-typescript": "^3.5.5",
+        "events": "^3.3.0",
         "globby": "^13.1.3",
         "husky": "^7.0.0",
         "istanbul": "^0.4.5",
@@ -115,13 +111,14 @@
         "karma-sourcemap-loader": "^0.3.7",
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "^5.0.0",
-        "matchdep": "^2.0.0",
         "mocha": "^10.2.0",
         "prettier": "^2.8.8",
-        "puppeteer": "^13.5.1",
+        "puppeteer": "^22.11.2",
+        "querystring-es3": "^0.2.1",
         "rimraf": "^3.0.2",
         "source-map-support": "^0.5.19",
         "ts-loader": "^9.4.3",
+        "typescript": "^5.1.6",
         "webpack": "^5.78.0",
         "webpack-cli": "^5.0.1",
         "webpack-node-externals": "^3.0.0"

package.json

@@ -25,6 +25,9 @@ export { Plugin };
 import { TronWeb } from './tronweb.js';
 export { TronWeb };
 
+import * as Types from './types/index.js';
+export { Types };
+
 export default {
     utils,
     BigNumber,
@@ -35,4 +38,5 @@ export default {
     Event,
     Plugin,
     TronWeb,
+    Types,
 };

src/index.ts

@@ -1388,7 +1388,7 @@ export class TransactionBuilder {
         if (isNotNullOrUndefined(precision) && (!isInteger(precision) || precision < 0 || precision > 6))
             throw new Error('precision must be a positive integer >= 0 and <= 6');
 
-        const data: Optional<AssetIssueContract> = {
+        const data: Partial<AssetIssueContract> = {
             owner_address: toHex(issuerAddress),
             name: fromUtf8(name as string),
             abbr: fromUtf8(abbreviation as string),
@@ -2108,7 +2108,7 @@ export class TransactionBuilder {
             owner_address: toHex(ownerAddress as string),
         };
         if (ownerPermission) {
-            const _ownerPermissions = deepCopyJson<Optional<Permission>>(ownerPermission);
+            const _ownerPermissions = deepCopyJson<Partial<Permission>>(ownerPermission);
             // for compatible with old way of building transaction from chain which type prop is omitted
             if ('type' in _ownerPermissions) {
                 delete _ownerPermissions.type;

src/lib/TransactionBuilder/TransactionBuilder.ts

@@ -1,11 +1,6 @@
-import axios, { Method, RawAxiosRequestHeaders, AxiosHeaders, HeadersDefaults } from 'axios';
+import axios, { Method } from 'axios';
 import { hasProperties, isObject, isValidURL } from '../../utils/validations.js';
-
-export type HeadersType = RawAxiosRequestHeaders | AxiosHeaders | Partial<HeadersDefaults>;
-
-export interface HttpProviderInstance {
-    request<R = any>(config: any): Promise<R>;
-}
+import { HeadersType, HttpProviderInstance } from '../../types/Providers.js';
 
 export default class HttpProvider {
     host: string;

src/lib/providers/HttpProvider.ts

@@ -12,7 +12,7 @@ import { Plugin } from './lib/plugin.js';
 import { Event } from './lib/event.js';
 import { keccak256 } from './utils/ethersUtils.js';
 import { fromHex, fromPrivateKey, isAddress, toHex } from './utils/address.js';
-import { HeadersType } from './lib/providers/HttpProvider.js';
+import { HeadersType } from './types/Providers.js';
 import { isString } from './utils/validations.js';
 import { DefaultAddress, NodeProvider, TronWebOptions } from './types/TronWeb.js';
 import { ContractAbiInterface } from './types/ABI.js';
@@ -22,7 +22,7 @@ const DEFAULT_VERSION = '4.7.1';
 
 const FEE_LIMIT = 150000000;
 
-const version = '6.0.0-beta.3';
+const version = '6.0.0-beta.4';
 
 function isValidOptions(options: unknown): options is TronWebOptions {
     return (

src/tronweb.ts

@@ -20,7 +20,8 @@ export interface BlockWithoutDetail {
 
 export interface Block {
     blockID: string;
-    transactions: Transaction[];
+    /** If a block has 0 transaction, this prop will be undefined */
+    transactions?: Transaction[];
     block_header: BlockHeader;
 }
 

src/types/APIResponse.ts

@@ -0,0 +1,7 @@
+import { RawAxiosRequestHeaders, AxiosHeaders, HeadersDefaults } from 'axios';
+export type HeadersType = RawAxiosRequestHeaders | AxiosHeaders | Partial<HeadersDefaults>;
+export type RequestHeaders = RawAxiosRequestHeaders;
+
+export interface HttpProviderInstance {
+    request<R = any>(config: any): Promise<R>;
+}

src/types/Providers.ts

@@ -1,12 +1,13 @@
 import { AxiosRequestHeaders } from 'axios';
+import type { HeadersType } from './Providers.js';
 import HttpProvider from '../lib/providers/HttpProvider.js';
 
 export interface TronWebOptions {
     fullNode?: NodeProvider;
     solidityNode?: NodeProvider;
     fullHost?: NodeProvider;
     eventServer?: NodeProvider;
-    headers?: AxiosRequestHeaders;
+    headers?: HeadersType;
     eventHeaders?: AxiosRequestHeaders;
     privateKey?: string;
     disablePlugins?: boolean;