Update iguWallet

Author: bsinicki

README.md

@@ -100,7 +100,7 @@ https://bscscan.com/address/0xb085320eaBC561506E818CE1BFc35347076c1184
 
 #### IGU Wallet
 
-```0xaf759Af05f4a03B3ff42F86Be58C4CD651542242```
+```0x4C63e0d152aC4149E0d501ace532a12B0f553416```
 
 https://bscscan.com/address/0xaf759Af05f4a03B3ff42F86Be58C4CD651542242
 

contracts/wallet/IguWallet.sol

@@ -43,26 +43,29 @@ contract IguWallet is Ownable, EIP712 {
         uint256 amount,
         uint256 fee,
         uint256 nonce,
+        uint256 deadline,
         bytes memory signature
     ) external {
         require(
             !isNonceUsed[nonce],
             "IguWallet: Nonce already used"
         );
+        require(deadline>block.timestamp, "IguWallet: Transaction overdue");
         isNonceUsed[nonce] = true;
         bytes32 typedHash = _hashTypedDataV4(
             keccak256(
                 abi.encode(
                     keccak256(
-                        "WithdrawData(address walletAddress,uint256 amount,uint256 fee,uint256 nonce)"
+                        "WithdrawData(address walletAddress,uint256 amount,uint256 fee,uint256 nonce,uint256 deadline)"
                     ),
                     walletAddress,
                     amount,
                     fee,
-                    nonce
+                    nonce,
+                    deadline
                 )
             )
-        );
+        ); 
         require(
             ECDSA.recover(typedHash, signature) == signer,
             "IguWallet: Signature Mismatch"

deployments/bsc/IguWallet.json

@@ -0,0 +1,100 @@
+import {
+  ContractReceipt,
+  ContractTransaction,
+} from "@ethersproject/contracts/src.ts/index";
+import { Network } from "@ethersproject/networks";
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { expect } from "chai";
+import { BigNumber } from "ethers";
+import { ethers } from "hardhat";
+import { IguToken, IguWallet, Iguverse } from "../typechain-types";
+import { deployContract, txExec } from "./helpers/utils";
+
+describe("Iguverse", function () {
+  let owner: SignerWithAddress;
+  let signer: SignerWithAddress;
+  let bob: SignerWithAddress;
+  let alice: SignerWithAddress;
+
+  let iguToken: IguToken;
+  let iguWallet: IguWallet;
+
+  let network: Network;
+
+  beforeEach(async () => {
+    [owner, signer, bob, alice] = await ethers.getSigners();
+    network = await ethers.provider.getNetwork();
+
+    iguToken = await deployContract("IguToken");
+    iguWallet = await deployContract(
+      "IguWallet",
+      iguToken.address,
+      owner.address,
+      owner.address
+    );
+
+    await iguToken
+      .connect(owner)
+      .approve(iguWallet.address, ethers.utils.parseEther("100"));
+
+    await iguWallet.deposit(ethers.utils.parseEther("100"));
+  });
+
+  describe("Signatures", () => {
+    let tx: ContractTransaction;
+    let recipt: ContractReceipt;
+    let balanceBefore: BigNumber;
+
+    beforeEach(async () => {
+      const domainData = {
+        name: "Iguverse",
+        version: "1",
+        chainId: network.chainId,
+        verifyingContract: iguWallet.address,
+      };
+
+      const types = {
+        WithdrawData: [
+          { name: "walletAddress", type: "address" },
+          { name: "amount", type: "uint256" },
+          { name: "fee", type: "uint256" },
+          { name: "nonce", type: "uint256" },
+          { name: "deadline", type: "uint256" },
+        ],
+      };
+
+      const value = {
+        walletAddress: owner.address,
+        amount: ethers.utils.parseEther("50"),
+        fee: ethers.utils.parseEther("10"),
+        nonce: "123",
+        deadline: "1000000000000"
+      };
+
+      balanceBefore = await ethers.provider.getBalance(alice.address);
+
+      const signature = await owner._signTypedData(domainData, types, value);
+
+      [tx, recipt] = await txExec(
+        iguWallet.connect(owner)
+          .withdraw(
+            value.walletAddress,
+            value.amount,
+            value.fee,
+            value.nonce,
+            value.deadline,
+            signature
+          )
+      );
+    });
+
+    it("Should emit IguToken Transfer event", async () => {
+      await expect(tx)
+        .to.emit(iguToken, "Transfer")
+        .withArgs(iguWallet.address, owner.address, ethers.utils.parseEther("50"));
+      await expect(tx)
+        .to.emit(iguToken, "Transfer")
+        .withArgs(iguWallet.address, owner.address, ethers.utils.parseEther("10"));
+    });
+  });
+});