[hebao_v1]gas recipient refine (#1321)

* gas recipient refine

* update

Author: kongliangzhong

packages/hebao_v1/contracts/base/MetaTxModule.sol

@@ -188,6 +188,7 @@ abstract contract MetaTxModule is BaseModule
             address(gasSetting[4])
         );
         require(gasSettings.limit > 0, "INVALID_GAS_LIMIT");
+        require(gasSettings.recipient == controller.collectTo(), "INVALID_GAS_RECIPIENT");
 
         address wallet = extractWalletAddress(data);
         bytes32 metaTxHash = EIP712.hashPacked(
@@ -232,7 +233,7 @@ abstract contract MetaTxModule is BaseModule
 
         emit MetaTxExecuted(msg.sender, wallet, nonce, metaTxHash, gasUsed, success, returnData);
 
-        if (gasSettings.price != 0) {
+        if (gasSettings.price != 0 && reimbursable(extractMethod(data))) {
             reimburseGasFee(wallet, gasSettings, gasUsed);
         }
     }
@@ -301,6 +302,14 @@ abstract contract MetaTxModule is BaseModule
         return (signers.length == 1 && signers[0] == signer);
     }
 
+    function reimbursable(bytes4 method)
+        internal
+        view
+        virtual
+        returns (bool) {
+        return true;
+    }
+
     /// @dev For all relayed method, the first parameter must be the wallet address.
     function extractWalletAddress(bytes memory data)
         internal
@@ -392,7 +401,7 @@ abstract contract MetaTxModule is BaseModule
         uint gasCost = gasUsed.add(gasSettings.overhead).mul(gasSettings.price);
         updateQuota(wallet, gasSettings.token, gasCost);
 
-        address feeRecipient = (gasSettings.recipient == address(0)) ? msg.sender : gasSettings.recipient;
+        address feeRecipient = gasSettings.recipient;
         if (gasSettings.token == address(0)) {
             transactCall(wallet, feeRecipient, gasCost, "");
         } else {

packages/hebao_v1/contracts/modules/security/GuardianModule.sol

@@ -229,4 +229,18 @@ contract GuardianModule is SecurityModule
             revert("INVALID_METHOD");
         }
     }
+
+    function reimbursable(bytes4 method)
+        internal
+        view
+        override
+        returns (bool) {
+        if (method == this.lock.selector || method == this.unlock.selector) {
+            return false;
+        } else {
+            return true;
+        }
+
+    }
+
 }