[hebaov2] wallet nonce refine (#2380)

* [hebaov2] wallet nonce refine

* update

Author: kongliangzhong

packages/hebao_v2/contracts/base/SmartWallet.sol

@@ -223,7 +223,7 @@ contract SmartWallet is ERC1271
          return wallet.isGuardian(addr, includePendingAddition);
      }
 
-     function guardians(bool includePendingAddition)
+     function getGuardians(bool includePendingAddition)
          public
          view
          returns (Guardian[] memory )
@@ -340,14 +340,6 @@ contract SmartWallet is ERC1271
         wallet.batchCall(to, data);
     }
 
-    function getNonce(address relayer)
-        public
-        view
-        returns (uint)
-    {
-        return wallet.nonce[relayer];
-    }
-
     //
     // Recover
     //

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

@@ -93,9 +93,9 @@ 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");
+        require(isNonceValid(wallet, metaTx.nonce, metaTx.data.toBytes4(0)), "INVALID_NONCE");
         if (metaTx.nonce != 0) {
-            wallet.nonce[msg.sender] = metaTx.nonce;
+            wallet.nonce = metaTx.nonce;
         } else {
             require(metaTx.requiresSuccess, "META_TX_WITHOUT_NONCE_REQUIRES_SUCCESS");
         }
@@ -153,7 +153,6 @@ library MetaTxLib
 
     function isNonceValid(
         Wallet  storage wallet,
-        address relayer,
         uint    nonce,
         bytes4  methodId
         )
@@ -174,7 +173,7 @@ library MetaTxLib
              methodId == SmartWallet.approveThenCallContractWA.selector ) {
             return nonce == 0;
         } else {
-            return nonce > wallet.nonce[relayer] && (nonce >> 128) <= block.number;
+            return nonce > wallet.nonce && (nonce >> 128) <= block.number;
         }
     }
 }

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

@@ -49,7 +49,7 @@ struct Wallet
     address owner;
 
     // relayer => nonce
-    mapping(address => uint) nonce;
+    uint nonce;
     // hash => consumed
     mapping(bytes32 => bool) hashes;
 

packages/hebao_v2/test/read.spec.ts

@@ -34,11 +34,13 @@ describe("wallet", () => {
   describe.only("read methods", () => {
     it("quota", async () => {
       const walletData = await wallet.wallet();
-      console.log("quota:", walletData["quota"]);
+      console.log("walletData:", walletData);
+      const quotaInfo = walletData["quota"];
+      console.log("quota:", quotaInfo);
     });
 
     it("guardians", async () => {
-      const guardians = await wallet.guardians(true);
+      const guardians = await wallet.getGuardians(true);
       console.log("guardians:", guardians);
     });
 
@@ -48,7 +50,8 @@ describe("wallet", () => {
     });
 
     it("getNonce", async () => {
-      const nonce = await wallet.getNonce("0x" + "11".repeat(20));
+      const walletData = await wallet.wallet();
+      const nonce = walletData["nonce"];
       console.log("nonce:", nonce);
     });
   });