fix: okx tron swap referrer rewards (#6320)

* fix: okx tron swap referrer reward * fix: lint * fix: serach token data error
OneKeyHQ · Dec 9, 2024 · 4237b4e · 4237b4e
1 parent fa3f06b
commit 4237b4e
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 303 deletions.
diff --git a/@types/tronweb.d.ts b/@types/tronweb.d.ts
diff --git a/package.json b/package.json
@@ -226,7 +226,7 @@
   },
   "resolutions": {
     "expo-modules-core": "1.11.13",
-    "tronweb@^5.1.0": "5.1.0",
+    "tronweb@^6.0.0": "6.0.0",
     "@babel/core": "7.23.5",
     "@babel/code-frame": "7.23.5",
     "@babel/generator": "7.23.5",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -53,7 +53,7 @@
     "near-api-js": "^2.1.4",
     "ripple-keypairs": "^1.3.1",
     "tonweb-mnemonic": "^1.0.1",
-    "tronweb": "^5.3.1",
+    "tronweb": "^6.0.0",
     "xrpl": "^2.13.0"
   },
   "devDependencies": {

diff --git a/packages/core/src/chains/tron/CoreChainSoftware.test.ts b/packages/core/src/chains/tron/CoreChainSoftware.test.ts
@@ -5,6 +5,8 @@ import coreTestsFixtures from '../../../@tests/fixtures/coreTestsFixtures';
 
 import CoreChainHd from './CoreChainHd';
 
+import type { IEncodedTxTron } from './types';
+
 const {
   hdCredential,
   // password,
@@ -60,7 +62,7 @@ const {
         },
         'raw_data_hex':
           '0a020a95220881a16498bf36d55740a8b7aebeb2315a67080112630a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412320a15418d765ef87acee24ad4ff6f5e755f36c1ee5574241215419e9113cb852004f53b25d8d565b6a1c8c310fb6118a08d0670d1e5aabeb231',
-      },
+      } as IEncodedTxTron,
       signedTx: {
         'encodedTx': null,
         'txid':

diff --git a/packages/core/src/chains/tron/CoreChainSoftware.ts b/packages/core/src/chains/tron/CoreChainSoftware.ts
@@ -32,7 +32,7 @@ function publicKeyToAddress(publicKey: string): string {
     curve,
     Buffer.from(publicKey, 'hex'),
   );
-  return TronWeb.address.fromHex(
+  return TronWeb.utils.address.fromHex(
     `41${keccak256(uncompressed.slice(-64)).slice(-40)}`,
   );
 }

diff --git a/packages/core/src/chains/tron/types.ts b/packages/core/src/chains/tron/types.ts
@@ -1,6 +1,6 @@
-import type { Transaction } from 'tronweb';
+import type { Types } from 'tronweb';
 
-export type IEncodedTxTron = Transaction;
+export type IEncodedTxTron = Types.Transaction;
 
 export type IDecodedTxExtraTron = {
   energyUsage?: number;

diff --git a/packages/kit-bg/src/providers/ProviderApiTron.ts b/packages/kit-bg/src/providers/ProviderApiTron.ts
@@ -1,8 +1,7 @@
 import { web3Errors } from '@onekeyfe/cross-inpage-provider-errors';
 import { IInjectedProviderNames } from '@onekeyfe/cross-inpage-provider-types';
 import { isNil } from 'lodash';
-import { type SignedTransaction } from 'tronweb';
-import TronWeb from 'tronweb';
+import { TronWeb } from 'tronweb';
 
 import {
   backgroundClass,
@@ -24,6 +23,7 @@ import type {
   IJsBridgeMessagePayload,
   IJsonRpcRequest,
 } from '@onekeyfe/cross-inpage-provider-types';
+import type { Types } from 'tronweb';
 
 const TRON_SCAN_REQUESTED_URL = {
   main: 'https://api.trongrid.io',
@@ -188,7 +188,7 @@ class ProviderApiTron extends ProviderApiBase {
   async tron_signTransaction(
     request: IJsBridgeMessagePayload,
     transaction: any,
-  ): Promise<SignedTransaction> {
+  ): Promise<Types.SignedTransaction> {
     defaultLogger.discovery.dapp.dappRequest({ request });
     console.log('tron_signTransaction', request, transaction);
 
@@ -207,7 +207,7 @@ class ProviderApiTron extends ProviderApiBase {
 
     console.log('tron_signTransaction DONE', result, request, transaction);
 
-    return JSON.parse(result.rawTx) as SignedTransaction;
+    return JSON.parse(result.rawTx) as Types.SignedTransaction;
   }
 
   @providerApiMethod()