@rabby-wallet/rabby-action 0.1.2 → 0.1.4

package/dist/actions/approveNFT/fetchData.js

@@ -25,6 +25,7 @@ export const fetchDataApproveNFT = (options, likeAction) => __awaiter(void 0, vo
         protocol: null,
         isDanger: false,
         tokenBalance: '0',
+        hasInteraction: false,
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(action.spender, chainId);
@@ -47,6 +48,10 @@ 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;
+    }));
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/approveToken/fetchData.js

@@ -21,6 +21,7 @@ export const fetchDataApproveToken = (options, likeAction) => __awaiter(void 0,
         isEOA: false,
         contract: null,
         riskExposure: 0,
+        hasInteraction: false,
         rank: null,
         bornAt: 0,
         protocol: null,
@@ -54,6 +55,10 @@ 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;
+    }));
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/batchPermit2/fetchData.js

@@ -29,6 +29,7 @@ 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,
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(spender, chainId);
@@ -55,6 +56,10 @@ export const fetchDataBatchPermit2 = (options) => __awaiter(void 0, void 0, void
         const list = yield Promise.all(tokens.map((token) => apiProvider.getToken(sender, chainId, token.id)));
         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;
+    }));
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/actions/common/fetchData.js

@@ -29,6 +29,7 @@ export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0
         rank: null,
         unexpectedAddr: null,
         receiverInWallet: false,
+        hasInteraction: false,
     };
     if (options.type === 'typed_data') {
         result.sender = sender;
@@ -52,6 +53,10 @@ 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;
+    }));
     if (actionData.contractCall || actionData.common) {
         const chain = walletProvider.findChain({
             serverId: chainId,

package/dist/actions/contractCall/fetchData.js

@@ -34,6 +34,7 @@ export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void
         unexpectedAddr: null,
         receiverInWallet: false,
         isDanger: false,
+        hasInteraction: false,
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(contractCall.contract.id, chainId);
@@ -42,7 +43,7 @@ export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void
         }
         else {
             result.rank = contractInfo.credit.rank_at;
-            result.isDanger = !!(contractInfo.is_danger.auto || contractInfo.is_danger.edit);
+            result.isDanger = !!contractInfo.is_phishing;
         }
     }));
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -55,6 +56,10 @@ 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;
+    }));
     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/send/fetchData.js

@@ -46,7 +46,7 @@ export const fetchDataSend = (options, likeSendAction) => __awaiter(void 0, void
         result.hasTransfer = has_transfer;
     }));
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { desc } = yield apiProvider.addrDesc(sendAction.to);
         if ((_a = desc.cex) === null || _a === void 0 ? void 0 : _a.id) {
             result.cex = {
@@ -66,6 +66,9 @@ export const fetchDataSend = (options, likeSendAction) => __awaiter(void 0, void
                 bornAt: desc.born_at,
             };
         }
+        if ((_b = desc.protocol) === null || _b === void 0 ? void 0 : _b[chainId]) {
+            result.protocol = desc.protocol[chainId];
+        }
         result.usd_value = desc.usd_value;
         if (result.cex) {
             const { support } = yield apiProvider.depositCexSupport(sendAction.token.id, sendAction.token.chain, result.cex.id);

package/dist/actions/swap/fetchData.js

@@ -35,6 +35,7 @@ export const fetchDataSwap = (options, likeSwapAction) => __awaiter(void 0, void
         rank: null,
         sender,
         receiverInWallet,
+        hasInteraction: false,
     };
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
         const contractInfo = yield apiProvider.getContractInfo(id, chainId);
@@ -47,6 +48,10 @@ 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;
+    }));
     yield waitQueueFinished(queue);
     return result;
 });

package/dist/types/actionRequireData.d.ts

@@ -10,6 +10,7 @@ export interface SwapRequireData {
     rank: number | null;
     sender: string;
     receiverInWallet: boolean;
+    hasInteraction: boolean;
 }
 export interface SendRequireData {
     eoa: {
@@ -57,6 +58,7 @@ export interface ApproveTokenRequireData {
     } | null;
     isDanger: boolean | null;
     token: TokenItem;
+    hasInteraction: boolean;
 }
 export type RevokeTokenApproveRequireData = ApproveTokenRequireData;
 export interface WrapTokenRequireData {
@@ -69,6 +71,7 @@ export interface WrapTokenRequireData {
     rank: number | null;
     sender: string;
     receiverInWallet: boolean;
+    hasInteraction: boolean;
 }
 export interface ContractCallRequireData {
     id: string;
@@ -85,6 +88,7 @@ export interface ContractCallRequireData {
     unexpectedAddr: ReceiverData | null;
     receiverInWallet: boolean;
     isDanger?: boolean;
+    hasInteraction: boolean;
 }
 export type ApproveNFTRequireData = Omit<ApproveTokenRequireData, 'token'> & {
     tokenBalance: string;
@@ -140,6 +144,7 @@ export interface ContractRequireData {
     rank: number | null;
     unexpectedAddr: ReceiverData | null;
     receiverInWallet: boolean;
+    hasInteraction: boolean;
 }
 export interface AssetOrderRequireData extends ContractRequireData {
     sender: string;

package/dist/utils/calcSlippageTolerance.js

@@ -5,8 +5,8 @@ export const calcSlippageTolerance = (base, actual) => {
     if (baseBn.eq(0) && actualBn.eq(0))
         return 0;
     if (baseBn.eq(0))
-        return 1;
-    if (actualBn.eq(0))
         return -1;
+    if (actualBn.eq(0))
+        return 1;
     return baseBn.minus(actualBn).div(baseBn).toNumber();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-action",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.19.1",
     "@debank/common": "^0.3.60",
-    "@rabby-wallet/rabby-api": "0.7.28",
+    "@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",