[hebaov2]add more test (#2352)

Author: kongliangzhong

packages/hebao_v2/.gitignore

@@ -5,3 +5,4 @@ node_modules/
 artifacts/
 cache/
 build/
+ABI/

packages/hebao_v2/contracts/base/OfficialGuardian.sol

@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2017 Loopring Technology Limited.
+pragma solidity ^0.7.0;
+
+import "../lib/ERC1271.sol";
+import "../lib/OwnerManagable.sol";
+import "../lib/SignatureUtil.sol";
+
+
+/// @title OfficialGuardian
+/// @author Freeman Zhong - <[email protected]>
+contract OfficialGuardian is OwnerManagable, ERC1271
+{
+    using SignatureUtil for bytes32;
+    mapping (address => bool) public whitelist;
+
+
+    /// @dev init owner for proxy contract:
+    function initOwner(address _owner)
+        external
+    {
+        require(owner == address(0), "INITIALIZED_ALREADY");
+        owner = _owner;
+    }
+
+    function isValidSignature(
+        bytes32        _signHash,
+        bytes   memory _signature
+        )
+        public
+        view
+        override
+        returns (bytes4)
+    {
+        return isManager(_signHash.recoverECDSASigner(_signature))?
+            ERC1271_MAGICVALUE:
+            bytes4(0);
+    }
+
+    function addWhitelist(address target, bool toAdd)
+        external
+        onlyOwner
+    {
+        require(target != address(0), "ZERO_ADDRESS");
+        require(whitelist[target] != toAdd, "SAME_VALUE");
+        whitelist[target] = toAdd;
+    }
+
+    function transact(
+        address  target,
+        uint     value,
+        bytes    calldata data
+        )
+        external
+        onlyManager
+        returns (
+            bool success,
+            bytes memory returnData
+        )
+    {
+        require(whitelist[target], "INVALID_TARGET");
+        // solium-disable-next-line security/no-call-value
+        (success, returnData) = target.call{value: value}(data);
+    }
+}

packages/hebao_v2/contracts/base/SmartWallet.sol

@@ -52,11 +52,6 @@ contract SmartWallet is ERC1271
     Wallet public wallet;
     //  ----- DATA LAYOUT ENDS -----
 
-    // ---- Events definitions ----
-    event GuardianAdded   (address guardian, uint effectiveTime);
-    event GuardianRemoved (address guardian, uint effectiveTime);
-    // ---- Events definitions end ----
-
     /// @dev We need to make sure the implemenation contract cannot be initialized
     ///      and used to do delegate calls to arbitrary contracts.
     modifier disableInImplementationContract

packages/hebao_v2/contracts/base/libwallet/MetaTxLib.sol

@@ -12,6 +12,7 @@ import "../../thirdparty/BytesUtil.sol";
 import "./WalletData.sol";
 import "./ERC20Lib.sol";
 import "./QuotaLib.sol";
+import "../SmartWallet.sol";
 
 
 /// @title MetaTxLib
@@ -31,7 +32,7 @@ library MetaTxLib
 
     event MetaTxExecuted(
         address relayer,
-        uint    nonce,
+        bytes32 metaTxHash,
         bool    success,
         uint    gasUsed
     );
@@ -56,6 +57,7 @@ library MetaTxLib
         )
         public
         view
+        returns (bytes32)
     {
         bytes memory encoded = abi.encode(
             META_TX_TYPEHASH,
@@ -71,6 +73,7 @@ library MetaTxLib
         );
         bytes32 metaTxHash = EIP712.hashPacked(DOMAIN_SEPARATOR, encoded);
         require(metaTxHash.verifySignature(wallet.owner, metaTx.signature), "INVALID_SIGNATURE");
+        return metaTxHash;
     }
 
     function executeMetaTx(
@@ -90,17 +93,19 @@ library MetaTxLib
         require(gasLeft >= (metaTx.gasLimit.mul(64) / 63), "OPERATOR_INSUFFICIENT_GAS");
 
         // Update the nonce before the call to protect against reentrancy
+        require(isNonceValid(wallet, msg.sender, metaTx.nonce, metaTx.data.toBytes4(0)), "INVALID_NONCE");
         if (metaTx.nonce != 0) {
-            require(isNonceValid(wallet, msg.sender, metaTx.nonce), "INVALID_NONCE");
             wallet.nonce[msg.sender] = metaTx.nonce;
+        } else {
+            require(metaTx.requiresSuccess, "META_TX_WITHOUT_NONCE_REQUIRES_SUCCESS");
         }
 
         (success, ) = metaTx.to.call{gas : metaTx.gasLimit}(metaTx.data);
 
         // These checks are done afterwards to use the latest state post meta-tx call
         require(!wallet.locked, "WALLET_LOCKED");
 
-        validateMetaTx(
+        bytes32 metaTxHash = validateMetaTx(
             wallet,
             DOMAIN_SEPARATOR,
             metaTx
@@ -124,7 +129,7 @@ library MetaTxLib
 
         emit MetaTxExecuted(
             msg.sender,
-            metaTx.nonce,
+            metaTxHash,
             success,
             gasUsed
         );
@@ -149,12 +154,27 @@ library MetaTxLib
     function isNonceValid(
         Wallet  storage wallet,
         address relayer,
-        uint    nonce
+        uint    nonce,
+        bytes4  methodId
         )
         public
         view
         returns (bool)
     {
-        return nonce > wallet.nonce[relayer] && (nonce >> 128) <= block.number;
+        if ( methodId == SmartWallet.changeMasterCopy.selector ||
+             methodId == SmartWallet.addGuardianWA.selector ||
+             methodId == SmartWallet.removeGuardianWA.selector ||
+             methodId == SmartWallet.unlock.selector ||
+             methodId == SmartWallet.changeDailyQuotaWA.selector ||
+             methodId == SmartWallet.recover.selector ||
+             methodId == SmartWallet.addToWhitelistWA.selector ||
+             methodId == SmartWallet.transferTokenWA.selector ||
+             methodId == SmartWallet.callContractWA.selector ||
+             methodId == SmartWallet.approveTokenWA.selector ||
+             methodId == SmartWallet.approveThenCallContractWA.selector ) {
+            return nonce == 0;
+        } else {
+            return nonce > wallet.nonce[relayer] && (nonce >> 128) <= block.number;
+        }
     }
 }

packages/hebao_v2/genAbi.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+rm -rf ABI/*
+
+solc \
+    -o ABI/ --overwrite \
+    --abi contracts/base/*.sol \
+    --allow-paths contracts/base/libwallet/*.sol contracts/thirdparty/proxy/*.sol contracts/thirdparty/*.sol contracts/lib/*.sol contracts/iface/*.sol
+
+ABI_PATH="ABI"
+
+for file in $ABI_PATH/*
+do
+    rename_file=$(echo $file | awk '{n=split($0,a,"_"); print a[n]}')
+    mv $file $rename_file
+done