@rabby-wallet/rabby-action 0.1.14 → 0.1.15-beta.0

package/dist/actions/approveToken/fetchData.js

@@ -8,10 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import PQueue from 'p-queue';
+import BigNumber from 'bignumber.js';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+const BALANCE_OF_SELECTOR = '0x70a08231';
 export const fetchDataApproveToken = (options, likeAction) => __awaiter(void 0, void 0, void 0, function* () {
     const queue = new PQueue();
-    const { sender, apiProvider, chainId, actionData } = options;
+    const { sender, apiProvider, chainId, actionData, walletProvider } = options;
     const action = likeAction || actionData.approveToken;
     if (!action || !chainId) {
         return {};
@@ -49,16 +51,37 @@ export const fetchDataApproveToken = (options, likeAction) => __awaiter(void 0,
             }));
         }
     }));
-    if (token) {
-        queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-            const t = yield apiProvider.getToken(sender, chainId, token.id);
-            result.token = t;
-        }));
-    }
+    const tokenTask = token
+        ? queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
+            if (!walletProvider.ethRpc) {
+                const tokenData = yield apiProvider.getToken(sender, chainId, token.id);
+                if (tokenData) {
+                    result.token = tokenData;
+                }
+                return;
+            }
+            const data = `${BALANCE_OF_SELECTOR}${sender
+                .toLowerCase()
+                .replace(/^0x/, '')
+                .padStart(64, '0')}`;
+            const rawAmountHex = yield walletProvider.ethRpc({
+                method: 'eth_call',
+                params: [{ to: token.id, data }, 'latest'],
+            }, chainId);
+            if (typeof rawAmountHex !== 'string' ||
+                !/^0x[0-9a-f]+$/i.test(rawAmountHex)) {
+                throw new Error('Invalid token balance returned by ethRpc');
+            }
+            const rawAmount = new BigNumber(rawAmountHex.slice(2), 16);
+            result.token = Object.assign(Object.assign({}, token), { amount: rawAmount
+                    .div(new BigNumber(10).pow(token.decimals))
+                    .toNumber(), raw_amount: rawAmount.toFixed(0), raw_amount_hex_str: `0x${rawAmount.toString(16)}` });
+        }))
+        : Promise.resolve();
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, spender);
         result.hasInteraction = hasInteraction.has_interaction;
     }));
-    yield waitQueueFinished(queue);
+    yield Promise.all([waitQueueFinished(queue), tokenTask]);
     return result;
 });

package/dist/types/walletProvider.d.ts

@@ -62,7 +62,15 @@ export interface TransactionGroup {
     isSubmitFailed?: boolean;
     $ctx?: any;
 }
+type EthRpc = (data: {
+    method: 'eth_call';
+    params: [{
+        to: string;
+        data: string;
+    }, 'latest'];
+}, chainId: string) => Promise<string>;
 export type WalletProvider = {
+    ethRpc?: EthRpc;
     hasAddress: (address: string) => Promise<boolean>;
     hasPrivateKeyInWallet: (address: string) => Promise<string>;
     getWhitelist: () => Promise<string[]>;
@@ -77,3 +85,4 @@ export type WalletProvider = {
     }) => Chain | null | undefined;
     ALIAS_ADDRESS: Record<string, string>;
 };
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-action",
-  "version": "0.1.14",
+  "version": "0.1.15-beta.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [