add some read functions in SmartWallet (#2374)

Author: kongliangzhong

packages/hebao_v2/contracts/base/SmartWallet.sol

@@ -40,6 +40,7 @@ contract SmartWallet is ERC1271
     bytes32     public immutable DOMAIN_SEPARATOR;
     PriceOracle public immutable priceOracle;
 
+
     // WARNING: Do not delete wallet state data to make this implementation
     // compatible with early versions.
     //
@@ -222,6 +223,14 @@ contract SmartWallet is ERC1271
          return wallet.isGuardian(addr, includePendingAddition);
      }
 
+     function guardians(bool includePendingAddition)
+         public
+         view
+         returns (Guardian[] memory )
+     {
+         return GuardianLib.guardians(wallet, includePendingAddition);
+     }
+
     //
     // Inheritance
     //
@@ -331,6 +340,14 @@ contract SmartWallet is ERC1271
         wallet.batchCall(to, data);
     }
 
+    function getNonce(address relayer)
+        public
+        view
+        returns (uint)
+    {
+        return wallet.nonce[relayer];
+    }
+
     //
     // Recover
     //
@@ -393,6 +410,15 @@ contract SmartWallet is ERC1271
         return wallet.whitelisted[addr];
     }
 
+    function isWhitelisted(
+        address addr
+        )
+        public
+        view
+        returns (bool) {
+        return wallet.isAddressWhitelisted(addr);
+    }
+
     //
     // ERC20
     //

packages/hebao_v2/test/helper/Constants.ts

@@ -2,7 +2,8 @@ export class Constants {
   static readonly emptyBytes: any = [];
   static readonly zeroAddress = "0x" + "00".repeat(20);
   static readonly emptyBytes32 = "0x" + "00".repeat(32);
-  static readonly chainId = 31337; // hardhat & ganache default chainId
+  static readonly chainId = 31337;  // hardhat & ganache default chainId
+
   // static readonly chainId = 212984383488152; // arbitrum testnet chainId
   // static readonly chainId = 97; // binance bsc testnet chainId
 }

packages/hebao_v2/test/read.spec.ts

@@ -0,0 +1,55 @@
+import { expect } from "./setup";
+import { signCreateWallet } from "./helper/signatureUtils";
+import { sign } from "./helper/Signature";
+import {
+  newWallet,
+  getFirstEvent,
+  advanceTime,
+  getBlockTimestamp
+} from "./commons";
+// import { /*l2ethers as*/ ethers } from "hardhat";
+const { ethers } = require("hardhat");
+
+import { Contract, Signer } from "ethers";
+import BN = require("bn.js");
+
+describe("wallet", () => {
+  let account1: Signer;
+  let account2: Signer;
+  let account3: Signer;
+
+  let wallet: any;
+
+  before(async () => {
+    [account1, account2, account3] = await ethers.getSigners();
+    const owner = await account1.getAddress();
+    const guardians = ["0x" + "11".repeat(20)];
+    wallet = await newWallet(owner, ethers.constants.AddressZero, 0, guardians);
+
+    const quotaAmount = ethers.utils.parseEther("10");
+    await wallet.changeDailyQuota(quotaAmount);
+    // const quotaInfo = (await wallet.wallet())["quota"];
+  });
+
+  describe.only("read methods", () => {
+    it("quota", async () => {
+      const walletData = await wallet.wallet();
+      console.log("quota:", walletData["quota"]);
+    });
+
+    it("guardians", async () => {
+      const guardians = await wallet.guardians(true);
+      console.log("guardians:", guardians);
+    });
+
+    it("isWhitelisted", async () => {
+      const isWhitelisted = await wallet.isWhitelisted("0x" + "22".repeat(20));
+      console.log("isWhitelisted:", isWhitelisted);
+    });
+
+    it("getNonce", async () => {
+      const nonce = await wallet.getNonce("0x" + "11".repeat(20));
+      console.log("nonce:", nonce);
+    });
+  });
+});