added events and getter functions for analytics

CanzaApps · Dec 14, 2023 · 399054b · 399054b
1 parent ef665b6
commit 399054b
Show file tree

Hide file tree

Showing 15 changed files with 15,304 additions and 474 deletions.
diff --git a/abi.json b/abi.json
diff --git a/contracts/USDC.sol b/contracts/USDC.sol
@@ -99,7 +99,7 @@ contract USDC is Context, USDCInterface, IERC20, Ownable, IERC20Metadata {
      * {IERC20-balanceOf} and {IERC20-transfer}.
      */
     function decimals() public view virtual override returns (uint8) {
-        return 18;
+        return 6;
     }
 
     /**

diff --git a/contracts/Vault.sol b/contracts/Vault.sol
@@ -142,9 +142,8 @@ contract Vault is
         uint256 indexed _mintAmount
     );
     event Swap(
-        address indexed _account,
         string _zTokenFrom,
-        string _zTokenTo
+        uint256 _amount
     );
     event Withdraw(
         address indexed _account,
@@ -322,7 +321,7 @@ contract Vault is
          */
          _mint(zUSD, treasuryWallet, treasuryFeePerTransaction);
 
-        emit Swap(msg.sender, _zTokenFrom, _zTokenTo);
+        emit Swap(_zTokenFrom, _amount);
     }
 
     /**
@@ -568,7 +567,7 @@ contract Vault is
 
          uint256 userColRatio = getUserCollateralRatio(_user);
 
-            if (userColRatio < COLLATERIZATION_RATIO_THRESHOLD) {
+            if (userColRatio < COLLATERIZATION_RATIO_THRESHOLD && userColRatio != 0) {
                 return true;
             }
 
@@ -713,10 +712,17 @@ contract Vault is
         return IERC20Upgradeable(_address).totalSupply();
     }
 
+    /**
+     * Get total number of minters
+     */
+    function getTotalMinters() external view returns (uint256) {
+        return mintersAddresses.length;
+    }
+
     /**
      * view minters addresses
      */
-    function viewMintersAddress(uint256 start, uint256 pageSize) external view   returns (address[] memory) {
+    function viewMintersAddress(uint256 start, uint256 pageSize) external view returns (address[] memory) {
         uint len = mintersAddresses.length;
 
         require(start < len, "out of range");