@aurigami/sdk 1.15.3 → 1.16.1

package/dist/types/index.d.ts

@@ -35,6 +35,7 @@ export declare type MoneyMarketDetails = {
     depositMETAApy: number;
     depositNEARApy: number;
     borrowNEARApy: number;
+    staderDepositApy: number;
 };
 export declare type UserDetails = {
     markets: UserMarketDetails[];
@@ -175,5 +176,5 @@ export declare type UserNotification = {
         mail: string;
         utilisation: number;
         liquidation: boolean;
-    };
+    }[];
 };

package/package.json

@@ -1,74 +1,73 @@
 {
-    "version": "1.15.3",
-    "license": "MIT",
-    "main": "dist/index.js",
-    "typings": "dist/index.d.ts",
-    "files": [
-        "dist",
-        "src"
-    ],
-    "engines": {
-        "node": ">=14"
-    },
-    "scripts": {
-        "start": "tsdx watch",
-        "build": "tsdx build",
-        "test": "tsdx test --no-cache",
-        "w-hardhat": "env TS_NODE_PROJECT=\"test-hardhat/tsconfig.json\" yarn hardhat",
-        "lint": "prettier --check \"{src,test,test-hardhat}/**/*.{js,ts}\"",
-        "format": "prettier --write \"{src,test,test-hardhat}/**/*.{js,ts}\"",
-        "prepare": "tsdx build",
-        "size": "size-limit",
-        "analyze": "size-limit --why"
-    },
-    "peerDependencies": {},
-    "husky": {
-        "hooks": {
-            "pre-commit": "tsdx lint"
-        }
-    },
-    "name": "@aurigami/sdk",
-    "author": "Aurigami Finance",
-    "module": "dist/sdk.esm.js",
-    "size-limit": [
-        {
-            "path": "dist/sdk.cjs.production.min.js",
-            "limit": "300 KB"
-        },
-        {
-            "path": "dist/sdk.esm.js",
-            "limit": "300 KB"
-        }
-    ],
-    "devDependencies": {
-        "@nomiclabs/hardhat-ethers": "^2.0.5",
-        "@nomiclabs/hardhat-etherscan": "^3.0.3",
-        "@nomiclabs/hardhat-waffle": "^2.0.3",
-        "@size-limit/preset-big-lib": "^7.0.8",
-        "@size-limit/webpack-why": "^7.0.8",
-        "@types/mocha": "^9.1.0",
-        "chai": "^4.3.6",
-        "dotenv": "^16.0.1",
-        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-prettier": "^4.0.0",
-        "ethereum-waffle": "^3.4.4",
-        "hardhat": "^2.9.3",
-        "husky": "^7.0.4",
-        "prettier": "^2.5.1",
-        "size-limit": "^7.0.5",
-        "ts-node": "^10.7.0",
-        "tsdx": "^0.14.1",
-        "tslib": "^2.3.1",
-        "typescript": "^4.5.4"
-    },
-    "dependencies": {
-        "@aurigami/contracts": "3.16.0",
-        "axios": "^0.26.1",
-        "bignumber.js": "^9.0.2",
-        "cache-decorator": "^0.1.6",
-        "ethers": "^5.6.4"
+  "version": "1.16.1",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "engines": {
+    "node": ">=14"
+  },
+  "scripts": {
+    "start": "tsdx watch",
+    "build": "tsdx build",
+    "test": "tsdx test --no-cache",
+    "w-hardhat": "env TS_NODE_PROJECT=\"test-hardhat/tsconfig.json\" yarn hardhat",
+    "lint": "prettier --check \"{src,test,test-hardhat}/**/*.{js,ts}\"",
+    "format": "prettier --write \"{src,test,test-hardhat}/**/*.{js,ts}\"",
+    "prepare": "tsdx build",
+    "size": "size-limit",
+    "analyze": "size-limit --why"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "tsdx lint"
+    }
+  },
+  "name": "@aurigami/sdk",
+  "author": "Aurigami Finance",
+  "module": "dist/sdk.esm.js",
+  "size-limit": [
+    {
+      "path": "dist/sdk.cjs.production.min.js",
+      "limit": "300 KB"
     },
-    "jest": {
-        "testURL": "https://app.aurigami.finance"
+    {
+      "path": "dist/sdk.esm.js",
+      "limit": "300 KB"
     }
-}
+  ],
+  "devDependencies": {
+    "@nomiclabs/hardhat-ethers": "^2.0.5",
+    "@nomiclabs/hardhat-etherscan": "^3.0.3",
+    "@nomiclabs/hardhat-waffle": "^2.0.3",
+    "@size-limit/preset-big-lib": "^7.0.8",
+    "@size-limit/webpack-why": "^7.0.8",
+    "@types/mocha": "^9.1.0",
+    "chai": "^4.3.6",
+    "dotenv": "^16.0.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "ethereum-waffle": "^3.4.4",
+    "hardhat": "^2.12.6",
+    "husky": "^7.0.4",
+    "prettier": "^2.5.1",
+    "size-limit": "^7.0.5",
+    "ts-node": "^10.7.0",
+    "tsdx": "^0.14.1",
+    "tslib": "^2.3.1",
+    "typescript": "^4.5.4"
+  },
+  "dependencies": {
+    "@aurigami/contracts": "3.17.0",
+    "axios": "^0.26.1",
+    "bignumber.js": "^9.0.2",
+    "cache-decorator": "^0.1.6",
+    "ethers": "^5.6.4"
+  },
+  "jest": {
+    "testURL": "https://app.aurigami.finance"
+  }
+}

package/src/consts/constants.ts

@@ -10,16 +10,7 @@ export const DECIMAL_PRECISION = 10;
 
 export const AURORA_PLUS_API_PREFIX = 'https://aurora.plus/api/wallet/';
 
-export type NetworkAddresses = {
-  auTokens: {
-    name: string;
-    address: string;
-    underlying: string;
-  }[];
-  misc: Record<string, string>;
-  tokens: Record<string, string>;
-};
-export const networkAddresses: NetworkAddresses = {
+export const networkAddresses = {
   auTokens: [
     {
       name: 'auUSDC',
@@ -76,6 +67,11 @@ export const networkAddresses: NetworkAddresses = {
       address: MAINNET_ADDRESSES.auTokens.USN.toLowerCase(),
       underlying: '0x5183e1b1091804bc2602586919e6880ac1cf2896'.toLowerCase(),
     },
+    {
+      name: 'auNEARX',
+      address: MAINNET_ADDRESSES.auTokens.NEARX.toLowerCase(),
+      underlying: '0xb39eeb9e168ef6c639f5e282fef1f6bc4dcae375'.toLowerCase(),
+    },
   ],
   misc: {
     COMPTROLLER: MAINNET_ADDRESSES.comptroller.toLowerCase(),
@@ -109,8 +105,9 @@ export const networkAddresses: NetworkAddresses = {
     PLY_WNEAR: '0x044b6b0cd3bb13d2b9057781df4459c66781dce7'.toLowerCase(),
     WNEAR_TRI: '0x84b123875f0f36b966d0b6ca14b31121bd9676ad'.toLowerCase(),
     AURORA_WNEAR: '0x1e0e812fbcd3eb75d8562ad6f310ed94d258d008'.toLowerCase(),
+    NEARX: '0xb39eeb9e168ef6c639f5e282fef1f6bc4dcae375'.toLowerCase(),
   },
-};
+} as const;
 
 export const DEPOSIT_ONLY_TOKENS = [
   MAINNET_ADDRESSES.auTokens.AURORA.toLowerCase(),

package/src/consts/decimals.ts

@@ -22,6 +22,7 @@ export const decimalRecords: Record<string, number> = {
   '0x04ac48711bcdc45b4d223fb021e09da73c71095e': 18, // PULP
   '0x044b6b0cd3bb13d2b9057781df4459c66781dce7': 18, // PLYWNEAR
   '0x5183e1b1091804bc2602586919e6880ac1cf2896': 18, // USN
-  '0x84b123875f0f36b966d0b6ca14b31121bd9676ad': 18, //WNEAR_TRI,
-  '0x1e0e812fbcd3eb75d8562ad6f310ed94d258d008': 18, //AURORA_WNEAR
+  '0x84b123875f0f36b966d0b6ca14b31121bd9676ad': 18, // WNEAR_TRI,
+  '0x1e0e812fbcd3eb75d8562ad6f310ed94d258d008': 18, // AURORA_WNEAR
+  '0xb39eeb9e168ef6c639f5e282fef1f6bc4dcae375': 24, // NEARX
 };

package/src/interactors/MoneyMarket.ts

@@ -16,12 +16,7 @@ import {
 } from '../entities';
 import * as helpers from '../helpers';
 import { calcValuation, fetchPrice, fetchValuation } from '../helpers/priceFetcher';
-import {
-  Address,
-  Apy,
-  MoneyMarketDetails,
-  NetworkConnection
-} from '../types';
+import { Address, Apy, MoneyMarketDetails, NetworkConnection } from '../types';
 
 type RewardSpeeds = {
   plyRewardSupplySpeed: BN;
@@ -199,6 +194,31 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return depositMETAApy;
   }
 
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
+  public async getDepositStaderAPY(): Promise<BigNumber> {
+    const rewardStartTime = 1675371600;
+    const currentTime = helpers.getCurrentTimestamp();
+    if (currentTime < rewardStartTime) {
+      return new BigNumber(0);
+    }
+    const [totalDeposited, underlyingPrice] = await Promise.all([
+      this.getTotalTokenDeposited(),
+      fetchPrice(this.underlying.address, this._networkConnection.provider),
+    ]);
+    let depositStaderApy;
+    if (helpers.isSameAddress(this.underlying.address, consts.networkAddresses.tokens.NEARX)) {
+      // 100$ a day
+      depositStaderApy = helpers.calcLMRewardApr(
+        new BigNumber(100),
+        underlyingPrice.multipliedBy(totalDeposited.formattedAmount()),
+        365
+      );
+    } else {
+      depositStaderApy = new BigNumber(0);
+    }
+    return depositStaderApy;
+  }
+
   public async getDetails(): Promise<MoneyMarketDetails> {
     const [totalDeposited, totalBorrowed, depositAPY, borrowAPY, collateralRatio, rewardSpeeds] =
       await Promise.all([
@@ -209,14 +229,21 @@ export class MoneyMarketRead extends BlockchainEntityRead {
         this.getCollateralRatio(),
         this.getRewardSpeeds(),
       ]);
-    const [depositPlyAPY, borrowPlyAPY, depositNearAPY, borrowNearAPY, depositMetaAPY] =
-      await Promise.all([
-        this.getDepositPlyAPY(),
-        this.getBorrowPlyAPY(),
-        this.getDepositNearAPY(),
-        this.getBorrowNearAPY(),
-        this.getDepositMetaAPY(),
-      ]);
+    const [
+      depositPlyAPY,
+      borrowPlyAPY,
+      depositNearAPY,
+      borrowNearAPY,
+      depositMetaAPY,
+      staderDepositApy,
+    ] = await Promise.all([
+      this.getDepositPlyAPY(),
+      this.getBorrowPlyAPY(),
+      this.getDepositNearAPY(),
+      this.getBorrowNearAPY(),
+      this.getDepositMetaAPY(),
+      this.getDepositStaderAPY(),
+    ]);
     return {
       auTokenAddress: this.auToken.address,
       totalTokenDeposited: totalDeposited,
@@ -237,6 +264,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       depositNEARApy: depositNearAPY.toNumber(),
       borrowNEARApy: borrowNearAPY.toNumber() * -1,
       depositMETAApy: depositMetaAPY.toNumber(),
+      staderDepositApy: staderDepositApy.toNumber(),
     };
   }
 
@@ -338,12 +366,15 @@ export class MoneyMarketRead extends BlockchainEntityRead {
       this.getBorrowNearAPY(),
       this.getBorrowPlyAPY(),
     ]);
+    // idk why i cannot put this to promise.all, txds keep getting error
+    const staderDepositApy = await this.getDepositStaderAPY();
     const suppliedValue = price.multipliedBy(depositBalance.formattedAmount());
     const borrowedValue = price.multipliedBy(borrowBalance.formattedAmount());
     const totalDepositApy = depositApy
       .plus(nearDepositApy)
       .plus(plyDepositApy)
-      .plus(metaDepositApy);
+      .plus(metaDepositApy)
+      .plus(staderDepositApy);
     const totalBorrowApy = borrowApy.plus(nearBorrowApy).plus(plyBorrowApy);
     const sum = helpers.calcNetApy(suppliedValue, totalDepositApy, borrowedValue, totalBorrowApy);
     return {

package/src/types/index.ts

@@ -40,6 +40,7 @@ export type MoneyMarketDetails = {
   depositMETAApy: number;
   depositNEARApy: number;
   borrowNEARApy: number;
+  staderDepositApy: number;
 };
 
 export type UserDetails = {
@@ -197,5 +198,5 @@ export type UserNotification = {
     mail: string;
     utilisation: number;
     liquidation: boolean;
-  };
+  }[];
 };