@rabby-wallet/rabby-action 0.1.7 → 0.2.0-beta.0

package/dist/actions/approveNFT/fetchData.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 export const fetchDataApproveNFT = (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, extraActionDataState } = options;
     const action = likeAction || actionData.approveNFT;
     if (!action) {
         return {};
@@ -25,7 +26,10 @@ export const fetchDataApproveNFT = (options, likeAction) => __awaiter(void 0, vo
         protocol: null,
         isDanger: false,
         tokenBalance: '0',
-        hasInteraction: false,
+        hasInteraction: null,
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(action.spender, chainId);
@@ -48,10 +52,15 @@ export const fetchDataApproveNFT = (options, likeAction) => __awaiter(void 0, vo
             }));
         }
     }));
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, action.spender);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender: action.spender,
+        extraActionDataState,
+        queue,
+        result,
+    });
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/approveToken/fetchData.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 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, extraActionDataState } = options;
     const action = likeAction || actionData.approveToken;
     if (!action || !chainId) {
         return {};
@@ -21,12 +22,15 @@ export const fetchDataApproveToken = (options, likeAction) => __awaiter(void 0,
         isEOA: false,
         contract: null,
         riskExposure: 0,
-        hasInteraction: false,
+        hasInteraction: null,
         rank: null,
         bornAt: 0,
         protocol: null,
         isDanger: false,
         token: Object.assign(Object.assign({}, token), { amount: 0, raw_amount_hex_str: '0x0' }),
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(spender, chainId);
@@ -55,10 +59,15 @@ export const fetchDataApproveToken = (options, likeAction) => __awaiter(void 0,
             result.token = t;
         }));
     }
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, spender);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender,
+        extraActionDataState,
+        queue,
+        result,
+    });
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/batchPermit2/fetchData.js

@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 export const fetchDataBatchPermit2 = (options) => __awaiter(void 0, void 0, void 0, function* () {
     if (options.type !== 'typed_data') {
         return {};
     }
-    const { actionData, apiProvider, sender, chainId } = options;
+    const { actionData, apiProvider, sender, chainId, extraActionDataState } = options;
     if (!actionData.batchPermit2 || !chainId) {
         return {};
     }
@@ -29,7 +30,10 @@ export const fetchDataBatchPermit2 = (options) => __awaiter(void 0, void 0, void
         protocol: null,
         isDanger: false,
         tokens: tokens.map((token) => (Object.assign(Object.assign({}, token), { amount: 0, raw_amount_hex_str: '0x0' }))),
-        hasInteraction: false,
+        hasInteraction: null,
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(spender, chainId);
@@ -53,13 +57,45 @@ export const fetchDataBatchPermit2 = (options) => __awaiter(void 0, void 0, void
         }
     }));
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const list = yield Promise.all(tokens.map((token) => apiProvider.getToken(sender, chainId, token.id)));
+        const list = yield Promise.all(tokens.map((token) => __awaiter(void 0, void 0, void 0, function* () {
+            const t = yield apiProvider.getToken(sender, chainId, token.id);
+            if (!t) {
+                // hacker will build a not exist token in batchPermit2 for avoid signature parse
+                return {
+                    amount: 0,
+                    chain: chainId,
+                    decimals: 0,
+                    display_symbol: 'Unknown Token',
+                    id: token.id,
+                    is_core: false,
+                    is_verified: false,
+                    is_wallet: false,
+                    logo_url: '',
+                    name: 'Unknown Token',
+                    optimized_symbol: 'Unknown Token',
+                    permit2_allowance_amount: 0,
+                    permit2_allowance_raw_amount: '0',
+                    price: 0,
+                    price_24h_change: 0,
+                    protocol_id: '',
+                    raw_amount: '0',
+                    symbol: 'Unknown Token',
+                    time_at: 0,
+                };
+            }
+            return t;
+        })));
         result.tokens = list;
     }));
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, spender);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender,
+        extraActionDataState,
+        queue,
+        result,
+    });
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/common/fetchData.js

@@ -9,10 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0, void 0, function* () {
     const { walletProvider, actionData, sender, apiProvider, chainId } = options;
     const queue = new PQueue();
     let action = likeAction;
+    const { extraActionDataState } = options;
     if (options.type === 'typed_data' && options.actionData.contractId) {
         action = {
             receiver: options.actionData.contractId,
@@ -29,7 +31,10 @@ export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0
         rank: null,
         unexpectedAddr: null,
         receiverInWallet: false,
-        hasInteraction: false,
+        hasInteraction: null,
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     if (options.type === 'typed_data') {
         result.sender = sender;
@@ -53,10 +58,15 @@ export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0
             result.bornAt = desc.born_at;
         }));
     }
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, receiver);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender: receiver,
+        extraActionDataState,
+        queue,
+        result,
+    });
     if (actionData.contractCall || actionData.common) {
         const chain = walletProvider.findChain({
             serverId: chainId,

package/dist/actions/contractCall/fetchData.js

@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import PQueue from 'p-queue';
 import { getProtocol } from '../../utils/getProtocol';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { extraActionDataState } = options;
     if (options.type !== 'transaction') {
         return {};
     }
@@ -34,7 +36,10 @@ export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void
         unexpectedAddr: null,
         receiverInWallet: false,
         isDanger: false,
-        hasInteraction: false,
+        hasInteraction: null,
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(contractCall.contract.id, chainId);
@@ -56,10 +61,15 @@ export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void
         }
         result.protocol = getProtocol(desc.protocol, chainId);
     }));
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, contractCall.contract.id);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender: contractCall.contract.id,
+        extraActionDataState,
+        queue,
+        result,
+    });
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         const addr = (_a = actionData.common) === null || _a === void 0 ? void 0 : _a.receiver;

package/dist/actions/swap/fetchData.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { fetchHasInteraction } from '../../fetches/fetchHasInteraction';
 // TODO: text
 export const fetchDataSwap = (options, likeSwapAction) => __awaiter(void 0, void 0, void 0, function* () {
     if (options.type === 'text') {
         return {};
     }
     const queue = new PQueue();
-    const { actionData, walletProvider, sender, apiProvider, chainId } = options;
+    const { actionData, walletProvider, sender, apiProvider, chainId, extraActionDataState, } = options;
     const swapAction = likeSwapAction || actionData.swap;
     if (!swapAction) {
         return {};
@@ -35,7 +36,10 @@ export const fetchDataSwap = (options, likeSwapAction) => __awaiter(void 0, void
         rank: null,
         sender,
         receiverInWallet,
-        hasInteraction: false,
+        hasInteraction: null,
+        extraState: {
+            hasInteraction: () => undefined,
+        },
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(id, chainId);
@@ -48,10 +52,15 @@ export const fetchDataSwap = (options, likeSwapAction) => __awaiter(void 0, void
             result.protocol = contractInfo.protocol;
         }
     }));
-    queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, id);
-        result.hasInteraction = hasInteraction.has_interaction;
-    }));
+    fetchHasInteraction({
+        apiProvider,
+        sender,
+        chainId,
+        spender: id,
+        extraActionDataState,
+        queue,
+        result,
+    });
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/fetches/fetchHasInteraction.d.ts

@@ -0,0 +1,17 @@
+import { OpenApiService } from '@rabby-wallet/rabby-api';
+import { ExtraActionRequiredDataState } from '../types';
+import PQueue from 'p-queue';
+export declare function fetchHasInteraction({ apiProvider, sender, chainId, spender, extraActionDataState, queue, result, }: {
+    apiProvider: OpenApiService;
+    sender: string;
+    chainId: string;
+    spender: string;
+    extraActionDataState: ExtraActionRequiredDataState | undefined;
+    queue: PQueue;
+    result: {
+        hasInteraction: boolean | null;
+        extraState: {
+            hasInteraction: () => void;
+        };
+    };
+}): void;

package/dist/fetches/fetchHasInteraction.js

@@ -0,0 +1,27 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+export function fetchHasInteraction({ apiProvider, sender, chainId, spender, extraActionDataState, queue, result, }) {
+    const handleHasInteraction = () => __awaiter(this, void 0, void 0, function* () {
+        const hasInteraction = yield apiProvider.hasInteraction(sender, chainId, spender);
+        return hasInteraction.has_interaction;
+    });
+    if (!extraActionDataState) {
+        queue.add(() => __awaiter(this, void 0, void 0, function* () {
+            result.hasInteraction = yield handleHasInteraction();
+        }));
+    }
+    if (extraActionDataState === null || extraActionDataState === void 0 ? void 0 : extraActionDataState.setHasInteraction) {
+        result.extraState.hasInteraction = () => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const hasInteraction = yield handleHasInteraction();
+            (_a = extraActionDataState.setHasInteraction) === null || _a === void 0 ? void 0 : _a.call(extraActionDataState, hasInteraction);
+        });
+    }
+}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from './parseAction';
 export * from './fetchActionRequiredData';
 export * from './formatSecurityEngineContext';
+export * from './useFetchActionRequiredData';
 export * from './types';
 export * from './utils/getProtocol';

package/dist/index.js

@@ -1,5 +1,6 @@
 export * from './parseAction';
 export * from './fetchActionRequiredData';
 export * from './formatSecurityEngineContext';
+export * from './useFetchActionRequiredData';
 export * from './types';
 export * from './utils/getProtocol';

package/dist/types/actionRequireData.d.ts

@@ -10,7 +10,10 @@ export interface SwapRequireData {
     rank: number | null;
     sender: string;
     receiverInWallet: boolean;
-    hasInteraction: boolean;
+    hasInteraction: boolean | null;
+    extraState: {
+        hasInteraction: () => void;
+    };
 }
 export interface SendRequireData {
     eoa: {
@@ -58,7 +61,10 @@ export interface ApproveTokenRequireData {
     } | null;
     isDanger: boolean | null;
     token: TokenItem;
-    hasInteraction: boolean;
+    hasInteraction: boolean | null;
+    extraState: {
+        hasInteraction: () => void;
+    };
 }
 export type RevokeTokenApproveRequireData = ApproveTokenRequireData;
 export interface WrapTokenRequireData {
@@ -71,7 +77,7 @@ export interface WrapTokenRequireData {
     rank: number | null;
     sender: string;
     receiverInWallet: boolean;
-    hasInteraction: boolean;
+    hasInteraction: boolean | null;
 }
 export interface ContractCallRequireData {
     id: string;
@@ -88,7 +94,10 @@ export interface ContractCallRequireData {
     unexpectedAddr: ReceiverData | null;
     receiverInWallet: boolean;
     isDanger?: boolean;
-    hasInteraction: boolean;
+    hasInteraction: boolean | null;
+    extraState: {
+        hasInteraction: () => void;
+    };
 }
 export type ApproveNFTRequireData = Omit<ApproveTokenRequireData, 'token'> & {
     tokenBalance: string;
@@ -144,7 +153,10 @@ export interface ContractRequireData {
     rank: number | null;
     unexpectedAddr: ReceiverData | null;
     receiverInWallet: boolean;
-    hasInteraction: boolean;
+    hasInteraction: boolean | null;
+    extraState: {
+        hasInteraction: () => void;
+    };
 }
 export interface AssetOrderRequireData extends ContractRequireData {
     sender: string;
@@ -159,4 +171,4 @@ export interface SwapTokenOrderRequireData extends ContractRequireData {
 export type BatchApproveTokenRequireData = Omit<ApproveTokenRequireData, 'token'> & {
     tokens: TokenItem[];
 };
-export type ActionRequireData = SwapRequireData | ApproveTokenRequireData | SendRequireData | ApproveNFTRequireData | RevokeNFTRequireData | ContractCallRequireData | Record<string, any> | ContractCallRequireData | CancelTxRequireData | WrapTokenRequireData | PushMultiSigRequireData | AssetOrderRequireData | BatchRevokePermit2RequireData | SwapTokenOrderRequireData | ContractRequireData | MultiSigRequireData | BatchApproveTokenRequireData | null;
+export type ActionRequireData = SwapRequireData | ApproveTokenRequireData | SendRequireData | ApproveNFTRequireData | RevokeNFTRequireData | Record<string, any> | ContractCallRequireData | CancelTxRequireData | WrapTokenRequireData | PushMultiSigRequireData | AssetOrderRequireData | BatchRevokePermit2RequireData | SwapTokenOrderRequireData | ContractRequireData | MultiSigRequireData | BatchApproveTokenRequireData | null;

package/dist/types/fetchActionRequiredData.d.ts

@@ -3,12 +3,16 @@ import { ParsedActionData } from './parsedActionData';
 import { OpenApiService } from '@rabby-wallet/rabby-api';
 import { WalletProvider } from './walletProvider';
 import { ActionRequireData } from './actionRequireData';
+export type ExtraActionRequiredDataState = {
+    setHasInteraction?: (v: boolean) => void;
+};
 type BaseFetchActionRequiredDataParameters<T extends 'typed_data' | 'transaction' | 'text' | undefined> = {
     actionData: ParsedActionData<T>;
     sender: string;
     walletProvider: WalletProvider;
     apiProvider: OpenApiService;
     chainId: string;
+    extraActionDataState?: ExtraActionRequiredDataState;
 };
 export type FetchTransactionRequiredDataParameters = BaseFetchActionRequiredDataParameters<'transaction'> & {
     type: 'transaction';

package/dist/useFetchActionRequiredData.d.ts

@@ -0,0 +1,5 @@
+import { ActionRequireData, FetchActionRequiredDataParameters } from './types';
+export declare const useFetchActionRequiredData: () => {
+    fetchActionRequiredData: (options: FetchActionRequiredDataParameters) => Promise<ActionRequireData>;
+    requiredData: ActionRequireData;
+};

package/dist/useFetchActionRequiredData.js

@@ -0,0 +1,30 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { fetchActionRequiredData } from './fetchActionRequiredData';
+import React from 'react';
+export const useFetchActionRequiredData = () => {
+    const [requiredData, setRequiredData] = React.useState(null);
+    const setHasInteraction = React.useCallback((hasInteraction) => {
+        setRequiredData((prev) => {
+            return Object.assign(Object.assign({}, prev), { hasInteraction });
+        });
+    }, []);
+    const _fetchActionRequiredData = React.useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
+        const result = yield fetchActionRequiredData(Object.assign(Object.assign({}, options), { extraActionDataState: {
+                setHasInteraction,
+            } }));
+        setRequiredData(result);
+        return result;
+    }), [setHasInteraction]);
+    return {
+        fetchActionRequiredData: _fetchActionRequiredData,
+        requiredData,
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-action",
-  "version": "0.1.7",
+  "version": "0.2.0-beta.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,9 +12,12 @@
   "devDependencies": {
     "@babel/preset-env": "^7.19.1",
     "@debank/common": "^0.3.60",
+    "@rabby-wallet/rabby-api": "0.7.33",
+    "@rabby-wallet/rabby-security-engine": "2.0.7",
     "@types/jest": "^29.0.3",
     "@types/lodash": "^4.14.185",
     "@types/node": "^18.7.18",
+    "@types/react": "^19.0.1",
     "babel-jest": "^29.0.3",
     "bignumber.js": "^9.1.2",
     "husky": ">=6",
@@ -24,6 +27,7 @@
     "lint-staged": ">=10",
     "p-queue": "7.3.0",
     "prettier": "^2.7.1",
+    "react": "^19.0.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.1",
@@ -41,7 +45,8 @@
     "@rabby-wallet/rabby-api": "*",
     "@rabby-wallet/rabby-security-engine": "*",
     "bignumber.js": "*",
-    "p-queue": "^7.3.0"
+    "p-queue": "^7.3.0",
+    "react": "*"
   },
   "author": "rabby",
   "description": "",