@rabby-wallet/rabby-action 0.1.1-beta → 0.1.1-beta.2

package/dist/actions/common/formatSecurityEngine.js

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 export const formatSecurityEngineCommon = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (!options.actionData.common) {
         return {};
     }
     return {
-        common: Object.assign(Object.assign({}, options.actionData.common), { receiverInWallet: options.requireData
-                .receiverInWallet }),
+        common: Object.assign(Object.assign({}, options.actionData.common), { receiverInWallet: (_a = options.requireData) === null || _a === void 0 ? void 0 : _a.receiverInWallet }),
     };
 });

package/dist/actions/contractCall/formatSecurityEngine.js

@@ -12,6 +12,17 @@ export const formatSecurityEngineContractCall = (options) => __awaiter(void 0, v
     if (!actionData.contractCall || !chainId) {
         return {};
     }
+    if (options.type === 'typed_data') {
+        if (options.actionData.contractId) {
+            return {
+                contractCall: {
+                    id: options.actionData.contractId,
+                    chainId: chainId,
+                },
+            };
+        }
+        return {};
+    }
     const data = requireData;
     return {
         contractCall: {

package/dist/fetchActionRequiredData.js

@@ -56,7 +56,6 @@ export const fetchActionRequiredData = (options) => __awaiter(void 0, void 0, vo
         fetchDataApproveToken(options),
         fetchDataAssetOrder(options),
         fetchDataCancelTx(options),
-        // @deprecated we don't parse common action data anymore, will be removed in the future
         fetchDataCommon(options),
         fetchDataContractCall(options),
         fetchDataCrossSwapToken(options),
@@ -89,5 +88,9 @@ export const fetchActionRequiredData = (options) => __awaiter(void 0, void 0, vo
         fetchDataCoboSafeModificationTokenApproval(options),
         fetchDataRevokePermit(options),
     ]);
-    return result.reduce((acc, val) => (Object.assign(Object.assign({}, acc), val)), {});
+    const requireData = result.reduce((acc, val) => (Object.assign(Object.assign({}, acc), val)), {});
+    if (requireData && Object.keys(requireData).length === 0) {
+        return null;
+    }
+    return requireData;
 });

package/dist/parseAction.js

@@ -47,7 +47,7 @@ export function parseAction(options) {
     if (options.type === 'typed_data') {
         result.push(
         // tx actions
-        parseTypedDataAction(parseActionCommon)(options), parseTypedDataAction(parseActionAssetOrder)(options), parseTypedDataAction(parseActionSend)(options), parseTypedDataAction(parseActionApproveNFT)(options), parseTypedDataAction(parseActionApproveNFTCollection)(options), parseTypedDataAction(parseActionApproveToken)(options), parseTypedDataAction(parseActionCancelTx)(options), parseTypedDataAction(parseActionCrossSwapToken)(options), parseTypedDataAction(parseActionCrossToken)(options), parseTypedDataAction(parseActionDeployContract)(options), parseTypedDataAction(parseActionPushMultiSig)(options), parseTypedDataAction(parseActionRevokeNFT)(options), parseTypedDataAction(parseActionRevokeNFTCollection)(options), parseTypedDataAction(parseActionRevokePermit2)(options), parseTypedDataAction(parseActionRevokeToken)(options), parseTypedDataAction(parseActionSendNFT)(options), parseTypedDataAction(parseActionSwap)(options), parseTypedDataAction(parseActionUnwrapToken)(options), parseTypedDataAction(parseActionWrapToken)(options), parseTypedDataAction(parseActionPermit2BatchRevokeToken)(options), 
+        parseTypedDataAction(parseActionCommon)(options), parseTypedDataAction(parseActionAssetOrder)(options), parseTypedDataAction(parseActionSend)(options), parseTypedDataAction(parseActionApproveNFT)(options), parseTypedDataAction(parseActionApproveNFTCollection)(options), parseTypedDataAction(parseActionApproveToken)(options), parseTypedDataAction(parseActionCancelTx)(options), parseTypedDataAction(parseActionCrossSwapToken)(options), parseTypedDataAction(parseActionCrossToken)(options), parseTypedDataAction(parseActionDeployContract)(options), parseTypedDataAction(parseActionPushMultiSig)(options), parseTypedDataAction(parseActionRevokeNFT)(options), parseTypedDataAction(parseActionRevokeNFTCollection)(options), parseTypedDataAction(parseActionRevokePermit2)(options), parseTypedDataAction(parseActionRevokeToken)(options), parseTypedDataAction(parseActionSendNFT)(options), parseTypedDataAction(parseActionSwap)(options), parseTypedDataAction(parseActionUnwrapToken)(options), parseTypedDataAction(parseActionWrapToken)(options), parseTypedDataAction(parseActionPermit2BatchRevokeToken)(options), parseTypedDataAction(parseActionTransferOwner)(options), parseTypedDataAction(parseActionSwapLimitPay)(options), parseTypedDataAction(parseActionMultiSwap)(options), 
         // typed data actions
         parseTypedDataAction(parseActionCreateKey)(options), parseTypedDataAction(parseActionVerifyAddress)(options), parseTypedDataAction(parseActionSellNFT)(options), parseTypedDataAction(parseActionBatchSellNFT)(options), parseTypedDataAction(parseActionSignMultiSig)(options), parseTypedDataAction(parseActionBuyNFT)(options), parseTypedDataAction(parseActionPermit)(options), parseTypedDataAction(parseActionPermit2)(options), parseTypedDataAction(parseActionBatchPermit2)(options), parseTypedDataAction(parseActionSwapTokenOrder)(options), parseTypedDataAction(parseActionCoboSafeCreate)(options), parseTypedDataAction(parseActionCoboSafeModificationDelegatedAddress)(options), parseTypedDataAction(parseActionCoboSafeModificationRole)(options), parseTypedDataAction(parseActionCoboSafeModificationTokenApproval)(options), parseTypedDataAction(parseActionRevokePermit)(options));
     }
@@ -66,7 +66,11 @@ export function parseAction(options) {
     }
     if (actionKeys.length === 0) {
         if (options.type === 'typed_data') {
-            return parseTypedDataAction(parseActionContractCall)(options);
+            const typedDataAction = action;
+            if (typedDataAction.chainId && typedDataAction.contractId) {
+                return parseTypedDataAction(parseActionContractCall)(options);
+            }
+            return parseTypedDataAction((r) => r)(options);
         }
         else if (options.type === 'transaction') {
             return parseActionContractCall(options);

package/package.json

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