From 4b7902ea13b827bea23667fc0d17bef63a9e40f3 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Thu, 5 Oct 2023 19:06:52 +0700
Subject: [PATCH 1/9] feat: smart contract for checking passport status (#72)

close #72
---
 contracts/utils/IPassportUtils.sol | 18 ++++++++++++++++++
 contracts/utils/PassportUtils.sol  | 10 ++++++++++
 package-lock.json                  |  4 ++--
 package.json                       |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 contracts/utils/IPassportUtils.sol
 create mode 100644 contracts/utils/PassportUtils.sol

diff --git a/contracts/utils/IPassportUtils.sol b/contracts/utils/IPassportUtils.sol
new file mode 100644
index 0000000..69e66df
--- /dev/null
+++ b/contracts/utils/IPassportUtils.sol
@@ -0,0 +1,18 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+interface IPassportUtils {
+  /**
+   * Returns `true` if a citizen's passport has become revocable.
+   *
+   * @param passportID The NFT passport ID
+   */
+  function isExpired(uint16 passportID) external view returns (bool);
+
+  // /**
+  //  * Returns the Unix epoch time when the passport will become revocable.
+  //  * 
+  //  * @param passportID The NFT passport ID
+  //  */
+  // function getExpirationTimestamp(uint16 passportID) external view returns (uint256);
+}
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
new file mode 100644
index 0000000..ec91d71
--- /dev/null
+++ b/contracts/utils/PassportUtils.sol
@@ -0,0 +1,10 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "./IPassportUtils.sol";
+
+contract PassportUtils is IPassportUtils {
+  function isExpired(uint16 passportID) public view returns (bool) {
+    return true;
+  }
+}
diff --git a/package-lock.json b/package-lock.json
index edc2609..184ede6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nationcred-contracts",
-  "version": "1.0.0",
+  "version": "0.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nationcred-contracts",
-      "version": "1.0.0",
+      "version": "0.5.0",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@openzeppelin/contracts": "^4.9.3"
diff --git a/package.json b/package.json
index 13be4be..3b66f70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nationcred-contracts",
-  "version": "1.0.0",
+  "version": "0.5.0",
   "description": "NationCred smart contracts",
   "main": "index.js",
   "scripts": {

From c970258970bf9d7463571134f5408de9d65d2959 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Thu, 5 Oct 2023 20:10:25 +0700
Subject: [PATCH 2/9] npx prettier

---
 contracts/utils/IPassportUtils.sol | 24 ++++++++++++------------
 contracts/utils/PassportUtils.sol  |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/contracts/utils/IPassportUtils.sol b/contracts/utils/IPassportUtils.sol
index 69e66df..37d5213 100644
--- a/contracts/utils/IPassportUtils.sol
+++ b/contracts/utils/IPassportUtils.sol
@@ -2,17 +2,17 @@
 pragma solidity ^0.8.17;
 
 interface IPassportUtils {
-  /**
-   * Returns `true` if a citizen's passport has become revocable.
-   *
-   * @param passportID The NFT passport ID
-   */
-  function isExpired(uint16 passportID) external view returns (bool);
+    /**
+     * Returns `true` if a citizen's passport has become revocable.
+     *
+     * @param passportID The NFT passport ID
+     */
+    function isExpired(uint16 passportID) external view returns (bool);
 
-  // /**
-  //  * Returns the Unix epoch time when the passport will become revocable.
-  //  * 
-  //  * @param passportID The NFT passport ID
-  //  */
-  // function getExpirationTimestamp(uint16 passportID) external view returns (uint256);
+    // /**
+    //  * Returns the Unix epoch time when the passport will become revocable.
+    //  *
+    //  * @param passportID The NFT passport ID
+    //  */
+    // function getExpirationTimestamp(uint16 passportID) external view returns (uint256);
 }
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index ec91d71..e3662e9 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.17;
 import "./IPassportUtils.sol";
 
 contract PassportUtils is IPassportUtils {
-  function isExpired(uint16 passportID) public view returns (bool) {
-    return true;
-  }
+    function isExpired(uint16 passportID) public view returns (bool) {
+        return true;
+    }
 }

From eadf828f3892373892b2ec530f34070148b9fa86 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Fri, 6 Oct 2023 20:28:48 +0700
Subject: [PATCH 3/9] feat: smart contract for checking passport status (#72)

#72
---
 contracts/governance/IVotingEscrow.sol | 15 ++++++
 contracts/mock/PassportIssuerMock.sol  | 10 ++++
 contracts/mock/VotingEscrowMock.sol    | 21 ++++++++
 contracts/passport/IPassportIssuer.sol |  6 +++
 contracts/utils/IPassportUtils.sol     |  6 +--
 contracts/utils/PassportUtils.sol      | 21 +++++++-
 scripts/deploy-passport-utils.ts       | 35 +++++++++++++
 test/PassportUtils.ts                  | 72 ++++++++++++++++++++++++++
 8 files changed, 181 insertions(+), 5 deletions(-)
 create mode 100644 contracts/governance/IVotingEscrow.sol
 create mode 100644 contracts/mock/PassportIssuerMock.sol
 create mode 100644 contracts/mock/VotingEscrowMock.sol
 create mode 100644 contracts/passport/IPassportIssuer.sol
 create mode 100644 scripts/deploy-passport-utils.ts
 create mode 100644 test/PassportUtils.ts

diff --git a/contracts/governance/IVotingEscrow.sol b/contracts/governance/IVotingEscrow.sol
new file mode 100644
index 0000000..b52aba6
--- /dev/null
+++ b/contracts/governance/IVotingEscrow.sol
@@ -0,0 +1,15 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+interface IVotingEscrow is IERC20 {
+    struct LockedBalance {
+        int128 amount;
+        uint256 end;
+    }
+
+    function locked(address) external view returns (LockedBalance memory);
+
+    // function balanceOf(address) external view returns (uint256);
+}
diff --git a/contracts/mock/PassportIssuerMock.sol b/contracts/mock/PassportIssuerMock.sol
new file mode 100644
index 0000000..ec4e621
--- /dev/null
+++ b/contracts/mock/PassportIssuerMock.sol
@@ -0,0 +1,10 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "../passport/IPassportIssuer.sol";
+
+contract PassportIssuerMock is IPassportIssuer {
+    function revokeUnderBalance() public view returns (uint256) {
+        return 1.5 * 1e18;
+    }
+}
diff --git a/contracts/mock/VotingEscrowMock.sol b/contracts/mock/VotingEscrowMock.sol
new file mode 100644
index 0000000..7a408c2
--- /dev/null
+++ b/contracts/mock/VotingEscrowMock.sol
@@ -0,0 +1,21 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "../governance/IVotingEscrow.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract VotingEscrowMock is ERC20, IVotingEscrow {
+    constructor() ERC20("Vote-escrowed NATION", "veNATION") {
+        _mint(msg.sender, 100 * 1e18);
+    }
+
+    function locked(
+        address
+    ) public view returns (LockedBalance memory lockedBalance) {
+        LockedBalance memory lockedBalance = LockedBalance({
+            amount: 1,
+            end: block.timestamp
+        });
+        return lockedBalance;
+    }
+}
diff --git a/contracts/passport/IPassportIssuer.sol b/contracts/passport/IPassportIssuer.sol
new file mode 100644
index 0000000..bd23efe
--- /dev/null
+++ b/contracts/passport/IPassportIssuer.sol
@@ -0,0 +1,6 @@
+//SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+interface IPassportIssuer {
+    function revokeUnderBalance() external view returns (uint256);
+}
diff --git a/contracts/utils/IPassportUtils.sol b/contracts/utils/IPassportUtils.sol
index 37d5213..7aa3fd9 100644
--- a/contracts/utils/IPassportUtils.sol
+++ b/contracts/utils/IPassportUtils.sol
@@ -5,14 +5,14 @@ interface IPassportUtils {
     /**
      * Returns `true` if a citizen's passport has become revocable.
      *
-     * @param passportID The NFT passport ID
+     * @param citizen The address of an NFT passport's owner
      */
-    function isExpired(uint16 passportID) external view returns (bool);
+    function isExpired(address citizen) external view returns (bool);
 
     // /**
     //  * Returns the Unix epoch time when the passport will become revocable.
     //  *
     //  * @param passportID The NFT passport ID
     //  */
-    // function getExpirationTimestamp(uint16 passportID) external view returns (uint256);
+    // function getExpirationTime(uint16 passportID) external view returns (uint256);
 }
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index e3662e9..746dc0d 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -2,9 +2,26 @@
 pragma solidity ^0.8.17;
 
 import "./IPassportUtils.sol";
+import "../passport/IPassportIssuer.sol";
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "hardhat/console.sol";
 
 contract PassportUtils is IPassportUtils {
-    function isExpired(uint16 passportID) public view returns (bool) {
-        return true;
+    using SafeERC20 for IERC20;
+
+    IPassportIssuer public passportIssuer;
+    IERC20 public votingEscrow;
+
+    constructor(address passportIssuerAddress, address votingEscrowAddress) {
+        passportIssuer = IPassportIssuer(passportIssuerAddress);
+        votingEscrow = IERC20(votingEscrowAddress);
+    }
+
+    function isExpired(address citizen) public view returns (bool) {
+        uint256 revokeUnderBalance = passportIssuer.revokeUnderBalance();
+        console.log("revokeUnderBalance:", revokeUnderBalance);
+        uint256 votingEscrowBalance = votingEscrow.balanceOf(citizen);
+        console.log("votingEscrowBalance:", votingEscrowBalance);
+        return votingEscrowBalance < revokeUnderBalance;
     }
 }
diff --git a/scripts/deploy-passport-utils.ts b/scripts/deploy-passport-utils.ts
new file mode 100644
index 0000000..9399d88
--- /dev/null
+++ b/scripts/deploy-passport-utils.ts
@@ -0,0 +1,35 @@
+// We require the Hardhat Runtime Environment explicitly here. This is optional
+// but useful for running the script in a standalone fashion through `node <script>`.
+//
+// When running the script with `npx hardhat run <script>` you'll find the Hardhat
+// Runtime Environment's members available in the global scope.
+import { ethers } from "hardhat";
+
+async function main() {
+  // Hardhat always runs the compile task when running scripts with its command
+  // line interface.
+  //
+  // If this script is run directly using `node` you may want to call compile
+  // manually to make sure everything is compiled
+  // await hre.run('compile');
+
+  // We get the contract to deploy
+  const PassportUtils = await ethers.getContractFactory("PassportUtils");
+  const passportIssuerAddress = "0x8c16926819AB30B8b29A8E23F5C230d164337093";
+  const votingEscrowAddress = "0xF7deF1D2FBDA6B74beE7452fdf7894Da9201065d";
+  const passportUtils = await PassportUtils.deploy(
+    passportIssuerAddress,
+    votingEscrowAddress
+  );
+
+  await passportUtils.deployed();
+
+  console.log("PassportUtils deployed to:", passportUtils.address);
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});
diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
new file mode 100644
index 0000000..8617635
--- /dev/null
+++ b/test/PassportUtils.ts
@@ -0,0 +1,72 @@
+import { expect } from "chai";
+import { loadFixture } from "ethereum-waffle";
+import { ethers } from "hardhat";
+
+describe("PassportUtils", function () {
+  async function deploymentFixture() {
+    console.log("deploymentFixture");
+
+    const [owner, otherAccount] = await ethers.getSigners();
+
+    const PassportIssuer = await ethers.getContractFactory(
+      "PassportIssuerMock"
+    );
+    const passportIssuer = await PassportIssuer.deploy();
+
+    const VotingEscrow = await ethers.getContractFactory("VotingEscrowMock");
+    const votingEscrow = await VotingEscrow.deploy();
+
+    const PassportUtils = await ethers.getContractFactory("PassportUtils");
+    const passportUtils = await PassportUtils.deploy(
+      passportIssuer.address,
+      votingEscrow.address
+    );
+    // await passportUtils.deployed();
+
+    return { votingEscrow, passportUtils, owner, otherAccount };
+  }
+
+  describe("isExpired", function () {
+    it("should return true if voting escrow balance is zero", async function () {
+      const { passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      expect(await passportUtils.isExpired(otherAccount.address)).to.equal(
+        true
+      );
+    });
+
+    it("should return true if voting escrow balance is 1.4999", async function () {
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      // Transfer 1.4999 $NATION to the second account
+      await votingEscrow.transfer(
+        otherAccount.address,
+        ethers.utils.parseUnits("1.4999")
+      );
+
+      expect(await passportUtils.isExpired(otherAccount.address)).to.equal(
+        true
+      );
+    });
+
+    it("should return false if voting escrow balance is 1.5000", async function () {
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      // Transfer 1.5000 $NATION to the second account
+      await votingEscrow.transfer(
+        otherAccount.address,
+        ethers.utils.parseUnits("1.5000")
+      );
+
+      expect(await passportUtils.isExpired(otherAccount.address)).to.equal(
+        false
+      );
+    });
+  });
+});

From a320c9408aa31b5f80d6ceb8574cd9af46685647 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:39:18 +0700
Subject: [PATCH 4/9] feat: smart contract for checking passport status (#72)

#72
---
 contracts/governance/IVotingEscrow.sol |  2 --
 contracts/utils/IPassportUtils.sol     | 22 ++++++++++++++++------
 contracts/utils/PassportUtils.sol      | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/contracts/governance/IVotingEscrow.sol b/contracts/governance/IVotingEscrow.sol
index b52aba6..2aca765 100644
--- a/contracts/governance/IVotingEscrow.sol
+++ b/contracts/governance/IVotingEscrow.sol
@@ -10,6 +10,4 @@ interface IVotingEscrow is IERC20 {
     }
 
     function locked(address) external view returns (LockedBalance memory);
-
-    // function balanceOf(address) external view returns (uint256);
 }
diff --git a/contracts/utils/IPassportUtils.sol b/contracts/utils/IPassportUtils.sol
index 7aa3fd9..d16c9f3 100644
--- a/contracts/utils/IPassportUtils.sol
+++ b/contracts/utils/IPassportUtils.sol
@@ -9,10 +9,20 @@ interface IPassportUtils {
      */
     function isExpired(address citizen) external view returns (bool);
 
-    // /**
-    //  * Returns the Unix epoch time when the passport will become revocable.
-    //  *
-    //  * @param passportID The NFT passport ID
-    //  */
-    // function getExpirationTime(uint16 passportID) external view returns (uint256);
+    /**
+     * Returns the Unix epoch timestamp when a citizen's passport will become revocable.
+     *
+     * @param citizen The address of an NFT passport's owner
+     */
+    function getExpirationTimestamp(
+        address citizen
+    ) external view returns (uint256);
+
+    /**
+     * Calculates the time when vote-escrowed `$NATION` will drop below the passport expiry threshold.
+     */
+    function calculateExpirationTimestamp(
+        uint256 lockAmount,
+        uint256 lockEnd
+    ) external view returns (uint256);
 }
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index 746dc0d..4b9926b 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -24,4 +24,19 @@ contract PassportUtils is IPassportUtils {
         console.log("votingEscrowBalance:", votingEscrowBalance);
         return votingEscrowBalance < revokeUnderBalance;
     }
+
+    function getExpirationTimestamp(
+        address citizen
+    ) public view returns (uint256) {
+        // TO DO
+        return 0;
+    }
+
+    function calculateExpirationTimestamp(
+        uint256 lockAmount,
+        uint256 lockEnd
+    ) public view returns (uint256) {
+        // TO DO
+        return 0;
+    }
 }

From e8fc8668cd5e5b46df318e1cf1e60c5a3796de9a Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Sat, 21 Oct 2023 16:36:30 +0700
Subject: [PATCH 5/9] feat: calculate passport expiration timestamp (#72)

#72
---
 contracts/utils/IPassportUtils.sol | 13 ++++---
 contracts/utils/PassportUtils.sol  | 24 ++++++++++---
 test/PassportUtils.ts              | 56 ++++++++++++++++++++++++++++--
 3 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/contracts/utils/IPassportUtils.sol b/contracts/utils/IPassportUtils.sol
index d16c9f3..2314ca7 100644
--- a/contracts/utils/IPassportUtils.sol
+++ b/contracts/utils/IPassportUtils.sol
@@ -10,7 +10,7 @@ interface IPassportUtils {
     function isExpired(address citizen) external view returns (bool);
 
     /**
-     * Returns the Unix epoch timestamp when a citizen's passport will become revocable.
+     * Returns the Unix epoch time when a citizen's passport will become revocable.
      *
      * @param citizen The address of an NFT passport's owner
      */
@@ -19,10 +19,15 @@ interface IPassportUtils {
     ) external view returns (uint256);
 
     /**
-     * Calculates the time when vote-escrowed `$NATION` will drop below the passport expiry threshold.
+     * Calculates the Unix epoch time when vote-escrowed `$NATION` will drop below a given threshold.
+     *
+     * @param lockAmount The amount of `$NATION` tokens that were locked
+     * @param lockEnd The lock expiration date in seconds
+     * @param votingEscrowThreshold The vote-escrowed `$NATION` balance when a passport will become revocable
      */
-    function calculateExpirationTimestamp(
+    function calculateThresholdTimestamp(
         uint256 lockAmount,
-        uint256 lockEnd
+        uint256 lockEnd,
+        uint256 votingEscrowThreshold
     ) external view returns (uint256);
 }
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index 4b9926b..286153a 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -32,11 +32,27 @@ contract PassportUtils is IPassportUtils {
         return 0;
     }
 
-    function calculateExpirationTimestamp(
+    function calculateThresholdTimestamp(
         uint256 lockAmount,
-        uint256 lockEnd
+        uint256 lockEnd,
+        uint256 votingEscrowThreshold
     ) public view returns (uint256) {
-        // TO DO
-        return 0;
+        console.log('lockAmount:', lockAmount);
+        console.log('lockEnd:', lockEnd);
+        console.log('votingEscrowThreshold:', votingEscrowThreshold);
+
+        uint256 maxLockPeriod = 4 * 365 days;
+        console.log('maxLockPeriod:', maxLockPeriod);
+        console.log('block.timestamp:', block.timestamp);
+        uint256 secondsUntilUnlock = lockEnd - block.timestamp;
+        console.log('secondsUntilUnlock:', secondsUntilUnlock);
+
+        uint256 thresholdPercentageOfLocked = 100 ether * votingEscrowThreshold / lockAmount;
+        console.log('thresholdPercentageOfLocked:', thresholdPercentageOfLocked);
+
+        uint256 secondsFromThresholdToUnlock = maxLockPeriod * thresholdPercentageOfLocked / 100 ether;
+        console.log('secondsFromThresholdToUnlock:', secondsFromThresholdToUnlock);
+
+        return lockEnd - secondsFromThresholdToUnlock;
     }
 }
diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
index 8617635..138f3ee 100644
--- a/test/PassportUtils.ts
+++ b/test/PassportUtils.ts
@@ -42,7 +42,7 @@ describe("PassportUtils", function () {
         deploymentFixture
       );
 
-      // Transfer 1.4999 $NATION to the second account
+      // Transfer 1.4999 $veNATION to the second account
       await votingEscrow.transfer(
         otherAccount.address,
         ethers.utils.parseUnits("1.4999")
@@ -58,7 +58,7 @@ describe("PassportUtils", function () {
         deploymentFixture
       );
 
-      // Transfer 1.5000 $NATION to the second account
+      // Transfer 1.5000 $veNATION to the second account
       await votingEscrow.transfer(
         otherAccount.address,
         ethers.utils.parseUnits("1.5000")
@@ -69,4 +69,56 @@ describe("PassportUtils", function () {
       );
     });
   });
+
+  describe("calculateThresholdTimestamp", function() {
+    it("votingEscrowThreshold 1.5 - should return 2 years into the future if 3 $NATION locked for 4 years", async function() {
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      const lockAmount = ethers.utils.parseUnits('3');
+      const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
+      
+      const lockEnd = new Date(new Date().getTime() + (4 * oneYearInMilliseconds));
+      console.log('lockEnd:', lockEnd);
+      const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
+      console.log('lockEndInSeconds:', lockEndInSeconds);
+
+      const votingEscrowThreshold = ethers.utils.parseUnits('1.5');
+
+      const expectedThresholdDate = new Date(new Date().getTime() + (2 * oneYearInMilliseconds));
+      console.log('expectedThresholdDate:', expectedThresholdDate);
+      const expectedThresholdDateInSeconds = Math.round(expectedThresholdDate.getTime() / 1_000);
+      console.log('expectedThresholdDateInSeconds:', expectedThresholdDateInSeconds);
+
+      const calculatedThresholdTimestamp = await passportUtils.calculateThresholdTimestamp(lockAmount, ethers.BigNumber.from(lockEndInSeconds), votingEscrowThreshold);
+      console.log('calculatedThresholdTimestamp:', new Date(calculatedThresholdTimestamp * 1_000));
+      expect (calculatedThresholdTimestamp).to.equal(ethers.BigNumber.from(expectedThresholdDateInSeconds));
+    });
+
+    it("votingEscrowThreshold 1.5 - should return 3 years into the future if 6 $NATION locked for 4 years", async function() {
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      const lockAmount = ethers.utils.parseUnits('6');
+      const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
+      
+      const lockEnd = new Date(new Date().getTime() + (4 * oneYearInMilliseconds));
+      console.log('lockEnd:', lockEnd);
+      const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
+      console.log('lockEndInSeconds:', lockEndInSeconds);
+
+      const votingEscrowThreshold = ethers.utils.parseUnits('1.5');
+
+      const expectedThresholdDate = new Date(new Date().getTime() + (3 * oneYearInMilliseconds));
+      console.log('expectedThresholdDate:', expectedThresholdDate);
+      const expectedThresholdDateInSeconds = Math.round(expectedThresholdDate.getTime() / 1_000);
+      console.log('expectedThresholdDateInSeconds:', expectedThresholdDateInSeconds);
+      
+      const calculatedThresholdTimestamp = await passportUtils.calculateThresholdTimestamp(lockAmount, ethers.BigNumber.from(lockEndInSeconds), votingEscrowThreshold);
+      console.log('calculatedThresholdTimestamp:', new Date(calculatedThresholdTimestamp * 1_000));
+      expect (calculatedThresholdTimestamp).to.equal(ethers.BigNumber.from(expectedThresholdDateInSeconds));
+    });
+  });
 });

From ff8301f94bdf20146a039638b78f38d32f0a736a Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Sat, 21 Oct 2023 16:41:54 +0700
Subject: [PATCH 6/9] chore: prettier (#72)

#72
---
 contracts/utils/PassportUtils.sol |  28 +++++---
 test/PassportUtils.ts             | 102 ++++++++++++++++++++----------
 2 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index 286153a..9e24e65 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -37,21 +37,29 @@ contract PassportUtils is IPassportUtils {
         uint256 lockEnd,
         uint256 votingEscrowThreshold
     ) public view returns (uint256) {
-        console.log('lockAmount:', lockAmount);
-        console.log('lockEnd:', lockEnd);
-        console.log('votingEscrowThreshold:', votingEscrowThreshold);
+        console.log("lockAmount:", lockAmount);
+        console.log("lockEnd:", lockEnd);
+        console.log("votingEscrowThreshold:", votingEscrowThreshold);
 
         uint256 maxLockPeriod = 4 * 365 days;
-        console.log('maxLockPeriod:', maxLockPeriod);
-        console.log('block.timestamp:', block.timestamp);
+        console.log("maxLockPeriod:", maxLockPeriod);
+        console.log("block.timestamp:", block.timestamp);
         uint256 secondsUntilUnlock = lockEnd - block.timestamp;
-        console.log('secondsUntilUnlock:', secondsUntilUnlock);
+        console.log("secondsUntilUnlock:", secondsUntilUnlock);
 
-        uint256 thresholdPercentageOfLocked = 100 ether * votingEscrowThreshold / lockAmount;
-        console.log('thresholdPercentageOfLocked:', thresholdPercentageOfLocked);
+        uint256 thresholdPercentageOfLocked = (100 ether *
+            votingEscrowThreshold) / lockAmount;
+        console.log(
+            "thresholdPercentageOfLocked:",
+            thresholdPercentageOfLocked
+        );
 
-        uint256 secondsFromThresholdToUnlock = maxLockPeriod * thresholdPercentageOfLocked / 100 ether;
-        console.log('secondsFromThresholdToUnlock:', secondsFromThresholdToUnlock);
+        uint256 secondsFromThresholdToUnlock = (maxLockPeriod *
+            thresholdPercentageOfLocked) / 100 ether;
+        console.log(
+            "secondsFromThresholdToUnlock:",
+            secondsFromThresholdToUnlock
+        );
 
         return lockEnd - secondsFromThresholdToUnlock;
     }
diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
index 138f3ee..ad230c8 100644
--- a/test/PassportUtils.ts
+++ b/test/PassportUtils.ts
@@ -70,55 +70,93 @@ describe("PassportUtils", function () {
     });
   });
 
-  describe("calculateThresholdTimestamp", function() {
-    it("votingEscrowThreshold 1.5 - should return 2 years into the future if 3 $NATION locked for 4 years", async function() {
+  describe("calculateThresholdTimestamp", function () {
+    it("votingEscrowThreshold 1.5 - should return 2 years into the future if 3 $NATION locked for 4 years", async function () {
       const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
-      const lockAmount = ethers.utils.parseUnits('3');
+      const lockAmount = ethers.utils.parseUnits("3");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
-      
-      const lockEnd = new Date(new Date().getTime() + (4 * oneYearInMilliseconds));
-      console.log('lockEnd:', lockEnd);
+
+      const lockEnd = new Date(
+        new Date().getTime() + 4 * oneYearInMilliseconds
+      );
+      console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
-      console.log('lockEndInSeconds:', lockEndInSeconds);
+      console.log("lockEndInSeconds:", lockEndInSeconds);
 
-      const votingEscrowThreshold = ethers.utils.parseUnits('1.5');
+      const votingEscrowThreshold = ethers.utils.parseUnits("1.5");
 
-      const expectedThresholdDate = new Date(new Date().getTime() + (2 * oneYearInMilliseconds));
-      console.log('expectedThresholdDate:', expectedThresholdDate);
-      const expectedThresholdDateInSeconds = Math.round(expectedThresholdDate.getTime() / 1_000);
-      console.log('expectedThresholdDateInSeconds:', expectedThresholdDateInSeconds);
+      const expectedThresholdDate = new Date(
+        new Date().getTime() + 2 * oneYearInMilliseconds
+      );
+      console.log("expectedThresholdDate:", expectedThresholdDate);
+      const expectedThresholdDateInSeconds = Math.round(
+        expectedThresholdDate.getTime() / 1_000
+      );
+      console.log(
+        "expectedThresholdDateInSeconds:",
+        expectedThresholdDateInSeconds
+      );
 
-      const calculatedThresholdTimestamp = await passportUtils.calculateThresholdTimestamp(lockAmount, ethers.BigNumber.from(lockEndInSeconds), votingEscrowThreshold);
-      console.log('calculatedThresholdTimestamp:', new Date(calculatedThresholdTimestamp * 1_000));
-      expect (calculatedThresholdTimestamp).to.equal(ethers.BigNumber.from(expectedThresholdDateInSeconds));
+      const calculatedThresholdTimestamp =
+        await passportUtils.calculateThresholdTimestamp(
+          lockAmount,
+          ethers.BigNumber.from(lockEndInSeconds),
+          votingEscrowThreshold
+        );
+      console.log(
+        "calculatedThresholdTimestamp:",
+        new Date(calculatedThresholdTimestamp * 1_000)
+      );
+      expect(calculatedThresholdTimestamp).to.equal(
+        ethers.BigNumber.from(expectedThresholdDateInSeconds)
+      );
     });
 
-    it("votingEscrowThreshold 1.5 - should return 3 years into the future if 6 $NATION locked for 4 years", async function() {
+    it("votingEscrowThreshold 1.5 - should return 3 years into the future if 6 $NATION locked for 4 years", async function () {
       const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
-      const lockAmount = ethers.utils.parseUnits('6');
+      const lockAmount = ethers.utils.parseUnits("6");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
-      
-      const lockEnd = new Date(new Date().getTime() + (4 * oneYearInMilliseconds));
-      console.log('lockEnd:', lockEnd);
+
+      const lockEnd = new Date(
+        new Date().getTime() + 4 * oneYearInMilliseconds
+      );
+      console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
-      console.log('lockEndInSeconds:', lockEndInSeconds);
-
-      const votingEscrowThreshold = ethers.utils.parseUnits('1.5');
-
-      const expectedThresholdDate = new Date(new Date().getTime() + (3 * oneYearInMilliseconds));
-      console.log('expectedThresholdDate:', expectedThresholdDate);
-      const expectedThresholdDateInSeconds = Math.round(expectedThresholdDate.getTime() / 1_000);
-      console.log('expectedThresholdDateInSeconds:', expectedThresholdDateInSeconds);
-      
-      const calculatedThresholdTimestamp = await passportUtils.calculateThresholdTimestamp(lockAmount, ethers.BigNumber.from(lockEndInSeconds), votingEscrowThreshold);
-      console.log('calculatedThresholdTimestamp:', new Date(calculatedThresholdTimestamp * 1_000));
-      expect (calculatedThresholdTimestamp).to.equal(ethers.BigNumber.from(expectedThresholdDateInSeconds));
+      console.log("lockEndInSeconds:", lockEndInSeconds);
+
+      const votingEscrowThreshold = ethers.utils.parseUnits("1.5");
+
+      const expectedThresholdDate = new Date(
+        new Date().getTime() + 3 * oneYearInMilliseconds
+      );
+      console.log("expectedThresholdDate:", expectedThresholdDate);
+      const expectedThresholdDateInSeconds = Math.round(
+        expectedThresholdDate.getTime() / 1_000
+      );
+      console.log(
+        "expectedThresholdDateInSeconds:",
+        expectedThresholdDateInSeconds
+      );
+
+      const calculatedThresholdTimestamp =
+        await passportUtils.calculateThresholdTimestamp(
+          lockAmount,
+          ethers.BigNumber.from(lockEndInSeconds),
+          votingEscrowThreshold
+        );
+      console.log(
+        "calculatedThresholdTimestamp:",
+        new Date(calculatedThresholdTimestamp * 1_000)
+      );
+      expect(calculatedThresholdTimestamp).to.equal(
+        ethers.BigNumber.from(expectedThresholdDateInSeconds)
+      );
     });
   });
 });

From d914b593da4b8ef0cfe43ae7b802f06c87704ff6 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Sat, 21 Oct 2023 21:14:04 +0700
Subject: [PATCH 7/9] feat: expiration timestamp for citizen (#72)

#72
---
 contracts/mock/VotingEscrowMock.sol | 22 ++++++--
 contracts/utils/PassportUtils.sol   | 22 ++++++--
 test/PassportUtils.ts               | 86 ++++++++++++++++++++++++++---
 3 files changed, 112 insertions(+), 18 deletions(-)

diff --git a/contracts/mock/VotingEscrowMock.sol b/contracts/mock/VotingEscrowMock.sol
index 7a408c2..4bba587 100644
--- a/contracts/mock/VotingEscrowMock.sol
+++ b/contracts/mock/VotingEscrowMock.sol
@@ -3,19 +3,29 @@ pragma solidity ^0.8.17;
 
 import "../governance/IVotingEscrow.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "hardhat/console.sol";
 
 contract VotingEscrowMock is ERC20, IVotingEscrow {
+    mapping(address => LockedBalance) locks;
+
     constructor() ERC20("Vote-escrowed NATION", "veNATION") {
         _mint(msg.sender, 100 * 1e18);
     }
 
-    function locked(
-        address
-    ) public view returns (LockedBalance memory lockedBalance) {
+    function create_lock(int128 _value, uint256 _unlock_time) public {
+        console.log("create_lock");
+        console.log("uint256(int256(_value)):", uint256(int256(_value)));
+        console.log("_unlock_time:", _unlock_time);
         LockedBalance memory lockedBalance = LockedBalance({
-            amount: 1,
-            end: block.timestamp
+            amount: _value,
+            end: _unlock_time
         });
-        return lockedBalance;
+        locks[msg.sender] = lockedBalance;
+    }
+
+    function locked(
+        address account
+    ) public view returns (LockedBalance memory lockedBalance) {
+        return locks[account];
     }
 }
diff --git a/contracts/utils/PassportUtils.sol b/contracts/utils/PassportUtils.sol
index 9e24e65..3eed3af 100644
--- a/contracts/utils/PassportUtils.sol
+++ b/contracts/utils/PassportUtils.sol
@@ -3,6 +3,7 @@ pragma solidity ^0.8.17;
 
 import "./IPassportUtils.sol";
 import "../passport/IPassportIssuer.sol";
+import "../governance/IVotingEscrow.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "hardhat/console.sol";
 
@@ -10,11 +11,11 @@ contract PassportUtils is IPassportUtils {
     using SafeERC20 for IERC20;
 
     IPassportIssuer public passportIssuer;
-    IERC20 public votingEscrow;
+    IVotingEscrow public votingEscrow;
 
     constructor(address passportIssuerAddress, address votingEscrowAddress) {
         passportIssuer = IPassportIssuer(passportIssuerAddress);
-        votingEscrow = IERC20(votingEscrowAddress);
+        votingEscrow = IVotingEscrow(votingEscrowAddress);
     }
 
     function isExpired(address citizen) public view returns (bool) {
@@ -28,8 +29,21 @@ contract PassportUtils is IPassportUtils {
     function getExpirationTimestamp(
         address citizen
     ) public view returns (uint256) {
-        // TO DO
-        return 0;
+        IVotingEscrow.LockedBalance memory lockedBalance = votingEscrow.locked(
+            citizen
+        );
+        uint256 lockAmount = uint256(int256(lockedBalance.amount));
+        console.log("lockAmount:", lockAmount);
+        uint256 lockEnd = lockedBalance.end;
+        console.log("lockEnd:", lockEnd);
+        uint256 revokeUnderBalance = passportIssuer.revokeUnderBalance();
+        console.log("revokeUnderBalance:", revokeUnderBalance);
+        return
+            calculateThresholdTimestamp(
+                lockAmount,
+                lockEnd,
+                revokeUnderBalance
+            );
     }
 
     function calculateThresholdTimestamp(
diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
index ad230c8..dcd2ef3 100644
--- a/test/PassportUtils.ts
+++ b/test/PassportUtils.ts
@@ -38,7 +38,7 @@ describe("PassportUtils", function () {
     });
 
     it("should return true if voting escrow balance is 1.4999", async function () {
-      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
@@ -54,7 +54,7 @@ describe("PassportUtils", function () {
     });
 
     it("should return false if voting escrow balance is 1.5000", async function () {
-      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
@@ -71,8 +71,8 @@ describe("PassportUtils", function () {
   });
 
   describe("calculateThresholdTimestamp", function () {
-    it("votingEscrowThreshold 1.5 - should return 2 years into the future if 3 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+    it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
@@ -115,8 +115,8 @@ describe("PassportUtils", function () {
       );
     });
 
-    it("votingEscrowThreshold 1.5 - should return 3 years into the future if 6 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+    it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
         deploymentFixture
       );
 
@@ -124,7 +124,7 @@ describe("PassportUtils", function () {
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
 
       const lockEnd = new Date(
-        new Date().getTime() + 4 * oneYearInMilliseconds
+        new Date().getTime() + (4 * oneYearInMilliseconds)
       );
       console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
@@ -133,7 +133,7 @@ describe("PassportUtils", function () {
       const votingEscrowThreshold = ethers.utils.parseUnits("1.5");
 
       const expectedThresholdDate = new Date(
-        new Date().getTime() + 3 * oneYearInMilliseconds
+        new Date().getTime() + (3 * oneYearInMilliseconds)
       );
       console.log("expectedThresholdDate:", expectedThresholdDate);
       const expectedThresholdDateInSeconds = Math.round(
@@ -159,4 +159,74 @@ describe("PassportUtils", function () {
       );
     });
   });
+
+  describe("getExpirationTimestamp", function() {
+    it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
+      const initialLockDate = new Date();
+      console.log('initialLockDate:', initialLockDate);
+      
+      // Lock 3 $NATION for 4 years
+      const lockAmount = ethers.utils.parseUnits('3');
+      const lockEnd = new Date(initialLockDate.getTime() + (4 * oneYearInMilliseconds));
+      console.log('lockEnd:', lockEnd);
+      const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
+      await votingEscrow.create_lock(lockAmount, ethers.BigNumber.from(lockEndInSeconds));
+
+      const expectedExpirationDate = new Date(
+        initialLockDate.getTime() + (2 * oneYearInMilliseconds)
+      );
+      console.log("expectedExpirationDate:", expectedExpirationDate);
+      const expectedExpirationDateInSeconds = Math.round(
+        expectedExpirationDate.getTime() / 1_000
+      );
+      console.log(
+        "expectedExpirationDateInSeconds:",
+        expectedExpirationDateInSeconds
+      );
+      
+      const expirationTimestamp = await passportUtils.getExpirationTimestamp(owner.address);
+      console.log("expirationTimestamp:", expirationTimestamp);
+      console.log("expirationTimestamp (Date):", new Date(expirationTimestamp * 1_000));
+      expect(expirationTimestamp).to.equal(ethers.BigNumber.from(expectedExpirationDateInSeconds));
+    });
+
+    it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
+      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
+
+      const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
+      const initialLockDate = new Date();
+      console.log('initialLockDate:', initialLockDate);
+      
+      // Lock 6 $NATION for 4 years
+      const lockAmount = ethers.utils.parseUnits('6');
+      const lockEnd = new Date(initialLockDate.getTime() + (4 * oneYearInMilliseconds));
+      console.log('lockEnd:', lockEnd);
+      const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
+      await votingEscrow.create_lock(lockAmount, ethers.BigNumber.from(lockEndInSeconds));
+
+      const expectedExpirationDate = new Date(
+        initialLockDate.getTime() + (3 * oneYearInMilliseconds)
+      );
+      console.log("expectedExpirationDate:", expectedExpirationDate);
+      const expectedExpirationDateInSeconds = Math.round(
+        expectedExpirationDate.getTime() / 1_000
+      );
+      console.log(
+        "expectedExpirationDateInSeconds:",
+        expectedExpirationDateInSeconds
+      );
+      
+      const expirationTimestamp = await passportUtils.getExpirationTimestamp(owner.address);
+      console.log("expirationTimestamp:", expirationTimestamp);
+      console.log("expirationTimestamp (Date):", new Date(expirationTimestamp * 1_000));
+      expect(expirationTimestamp).to.equal(ethers.BigNumber.from(expectedExpirationDateInSeconds));
+    });
+  });
 });

From b8827fdccc017a793eaf413ea67b65fa18a552cb Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Sun, 22 Oct 2023 12:57:14 +0700
Subject: [PATCH 8/9] chore: npx eslint (#72)

#72
---
 test/PassportUtils.ts | 104 +++++++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 43 deletions(-)

diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
index dcd2ef3..dcbed5b 100644
--- a/test/PassportUtils.ts
+++ b/test/PassportUtils.ts
@@ -38,9 +38,8 @@ describe("PassportUtils", function () {
     });
 
     it("should return true if voting escrow balance is 1.4999", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       // Transfer 1.4999 $veNATION to the second account
       await votingEscrow.transfer(
@@ -54,9 +53,8 @@ describe("PassportUtils", function () {
     });
 
     it("should return false if voting escrow balance is 1.5000", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       // Transfer 1.5000 $veNATION to the second account
       await votingEscrow.transfer(
@@ -72,9 +70,8 @@ describe("PassportUtils", function () {
 
   describe("calculateThresholdTimestamp", function () {
     it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       const lockAmount = ethers.utils.parseUnits("3");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
@@ -116,15 +113,14 @@ describe("PassportUtils", function () {
     });
 
     it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       const lockAmount = ethers.utils.parseUnits("6");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
 
       const lockEnd = new Date(
-        new Date().getTime() + (4 * oneYearInMilliseconds)
+        new Date().getTime() + 4 * oneYearInMilliseconds
       );
       console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
@@ -133,7 +129,7 @@ describe("PassportUtils", function () {
       const votingEscrowThreshold = ethers.utils.parseUnits("1.5");
 
       const expectedThresholdDate = new Date(
-        new Date().getTime() + (3 * oneYearInMilliseconds)
+        new Date().getTime() + 3 * oneYearInMilliseconds
       );
       console.log("expectedThresholdDate:", expectedThresholdDate);
       const expectedThresholdDateInSeconds = Math.round(
@@ -160,25 +156,29 @@ describe("PassportUtils", function () {
     });
   });
 
-  describe("getExpirationTimestamp", function() {
+  describe("getExpirationTimestamp", function () {
     it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
       const initialLockDate = new Date();
-      console.log('initialLockDate:', initialLockDate);
-      
+      console.log("initialLockDate:", initialLockDate);
+
       // Lock 3 $NATION for 4 years
-      const lockAmount = ethers.utils.parseUnits('3');
-      const lockEnd = new Date(initialLockDate.getTime() + (4 * oneYearInMilliseconds));
-      console.log('lockEnd:', lockEnd);
+      const lockAmount = ethers.utils.parseUnits("3");
+      const lockEnd = new Date(
+        initialLockDate.getTime() + 4 * oneYearInMilliseconds
+      );
+      console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
-      await votingEscrow.create_lock(lockAmount, ethers.BigNumber.from(lockEndInSeconds));
+      await votingEscrow.create_lock(
+        lockAmount,
+        ethers.BigNumber.from(lockEndInSeconds)
+      );
 
       const expectedExpirationDate = new Date(
-        initialLockDate.getTime() + (2 * oneYearInMilliseconds)
+        initialLockDate.getTime() + 2 * oneYearInMilliseconds
       );
       console.log("expectedExpirationDate:", expectedExpirationDate);
       const expectedExpirationDateInSeconds = Math.round(
@@ -188,31 +188,42 @@ describe("PassportUtils", function () {
         "expectedExpirationDateInSeconds:",
         expectedExpirationDateInSeconds
       );
-      
-      const expirationTimestamp = await passportUtils.getExpirationTimestamp(owner.address);
+
+      const expirationTimestamp = await passportUtils.getExpirationTimestamp(
+        owner.address
+      );
       console.log("expirationTimestamp:", expirationTimestamp);
-      console.log("expirationTimestamp (Date):", new Date(expirationTimestamp * 1_000));
-      expect(expirationTimestamp).to.equal(ethers.BigNumber.from(expectedExpirationDateInSeconds));
+      console.log(
+        "expirationTimestamp (Date):",
+        new Date(expirationTimestamp * 1_000)
+      );
+      expect(expirationTimestamp).to.equal(
+        ethers.BigNumber.from(expectedExpirationDateInSeconds)
+      );
     });
 
     it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } = await loadFixture(
-        deploymentFixture
-      );
+      const { votingEscrow, passportUtils, owner, otherAccount } =
+        await loadFixture(deploymentFixture);
 
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
       const initialLockDate = new Date();
-      console.log('initialLockDate:', initialLockDate);
-      
+      console.log("initialLockDate:", initialLockDate);
+
       // Lock 6 $NATION for 4 years
-      const lockAmount = ethers.utils.parseUnits('6');
-      const lockEnd = new Date(initialLockDate.getTime() + (4 * oneYearInMilliseconds));
-      console.log('lockEnd:', lockEnd);
+      const lockAmount = ethers.utils.parseUnits("6");
+      const lockEnd = new Date(
+        initialLockDate.getTime() + 4 * oneYearInMilliseconds
+      );
+      console.log("lockEnd:", lockEnd);
       const lockEndInSeconds = Math.round(lockEnd.getTime() / 1_000);
-      await votingEscrow.create_lock(lockAmount, ethers.BigNumber.from(lockEndInSeconds));
+      await votingEscrow.create_lock(
+        lockAmount,
+        ethers.BigNumber.from(lockEndInSeconds)
+      );
 
       const expectedExpirationDate = new Date(
-        initialLockDate.getTime() + (3 * oneYearInMilliseconds)
+        initialLockDate.getTime() + 3 * oneYearInMilliseconds
       );
       console.log("expectedExpirationDate:", expectedExpirationDate);
       const expectedExpirationDateInSeconds = Math.round(
@@ -222,11 +233,18 @@ describe("PassportUtils", function () {
         "expectedExpirationDateInSeconds:",
         expectedExpirationDateInSeconds
       );
-      
-      const expirationTimestamp = await passportUtils.getExpirationTimestamp(owner.address);
+
+      const expirationTimestamp = await passportUtils.getExpirationTimestamp(
+        owner.address
+      );
       console.log("expirationTimestamp:", expirationTimestamp);
-      console.log("expirationTimestamp (Date):", new Date(expirationTimestamp * 1_000));
-      expect(expirationTimestamp).to.equal(ethers.BigNumber.from(expectedExpirationDateInSeconds));
+      console.log(
+        "expirationTimestamp (Date):",
+        new Date(expirationTimestamp * 1_000)
+      );
+      expect(expirationTimestamp).to.equal(
+        ethers.BigNumber.from(expectedExpirationDateInSeconds)
+      );
     });
   });
 });

From f4e4c87251753380914d356d007678549b6ab660 Mon Sep 17 00:00:00 2001
From: Aahna Ashina <95955389+aahna-ashina@users.noreply.github.com>
Date: Sun, 22 Oct 2023 12:58:49 +0700
Subject: [PATCH 9/9] chore: npx eslint (#72)

#72
---
 test/PassportUtils.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/test/PassportUtils.ts b/test/PassportUtils.ts
index dcbed5b..1faaeef 100644
--- a/test/PassportUtils.ts
+++ b/test/PassportUtils.ts
@@ -38,8 +38,9 @@ describe("PassportUtils", function () {
     });
 
     it("should return true if voting escrow balance is 1.4999", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
 
       // Transfer 1.4999 $veNATION to the second account
       await votingEscrow.transfer(
@@ -53,8 +54,9 @@ describe("PassportUtils", function () {
     });
 
     it("should return false if voting escrow balance is 1.5000", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { votingEscrow, passportUtils, otherAccount } = await loadFixture(
+        deploymentFixture
+      );
 
       // Transfer 1.5000 $veNATION to the second account
       await votingEscrow.transfer(
@@ -70,8 +72,7 @@ describe("PassportUtils", function () {
 
   describe("calculateThresholdTimestamp", function () {
     it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { passportUtils } = await loadFixture(deploymentFixture);
 
       const lockAmount = ethers.utils.parseUnits("3");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
@@ -113,8 +114,7 @@ describe("PassportUtils", function () {
     });
 
     it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { passportUtils } = await loadFixture(deploymentFixture);
 
       const lockAmount = ethers.utils.parseUnits("6");
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
@@ -158,8 +158,9 @@ describe("PassportUtils", function () {
 
   describe("getExpirationTimestamp", function () {
     it("votingEscrowThreshold 1.5 - 3 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { votingEscrow, passportUtils, owner } = await loadFixture(
+        deploymentFixture
+      );
 
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
       const initialLockDate = new Date();
@@ -203,8 +204,9 @@ describe("PassportUtils", function () {
     });
 
     it("votingEscrowThreshold 1.5 - 6 $NATION locked for 4 years", async function () {
-      const { votingEscrow, passportUtils, owner, otherAccount } =
-        await loadFixture(deploymentFixture);
+      const { votingEscrow, passportUtils, owner } = await loadFixture(
+        deploymentFixture
+      );
 
       const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
       const initialLockDate = new Date();