@aurigami/sdk 1.13.0 → 1.14.0

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.13.0",
+    "version": "1.14.0",
     "license": "MIT",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
@@ -65,6 +65,7 @@
         "@aurigami/contracts": "3.11.3",
         "axios": "^0.26.1",
         "bignumber.js": "^9.0.2",
+        "cache-decorator": "^0.1.6",
         "ethers": "^5.6.4"
     },
     "jest": {

package/src/consts/constants.ts

@@ -113,7 +113,6 @@ export const networkAddresses: NetworkAddresses = {
 };
 
 export const DEPOSIT_ONLY_TOKENS = [
-  MAINNET_ADDRESSES.auTokens.STNEAR.toLowerCase(),
   MAINNET_ADDRESSES.auTokens.AURORA.toLowerCase(),
   MAINNET_ADDRESSES.auTokens.TRI.toLowerCase(),
   MAINNET_ADDRESSES.auTokens.PLY.toLowerCase(),

package/src/helpers/helpers.ts

@@ -191,22 +191,22 @@ export function sortEvents<T extends Result>(events: TypedEvent<T>[]): TypedEven
   });
 }
 
-export function Cache(cacheTimeout: number) {
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-    const originalMethod = descriptor.value;
-    let cache = new Map<string, any>();
-    descriptor.value = function (...args: any[]) {
-      let key = JSON.stringify(args);
-      if (cache.has(key)) {
-        let [timestamp, value] = cache.get(key);
-        if (Date.now() - timestamp < cacheTimeout) {
-          return value;
-        }
-      }
-      let result = originalMethod.apply(this, args);
-      cache.set(key, [Date.now(), result]);
-      return result;
-    };
-    return descriptor;
-  };
-}
+// export function Cache(cacheTimeout: number) {
+//   return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
+//     const originalMethod = descriptor.value;
+//     let cache = new Map<string, any>();
+//     descriptor.value = function (...args: any[]) {
+//       let key = JSON.stringify(args);
+//       if (cache.has(key)) {
+//         let [timestamp, value] = cache.get(key);
+//         if (Date.now() - timestamp < cacheTimeout) {
+//           return value;
+//         }
+//       }
+//       let result = originalMethod.apply(this, args);
+//       cache.set(key, [Date.now(), result]);
+//       return result;
+//     };
+//     return descriptor;
+//   };
+// }

package/src/helpers/priceFetcher.ts

@@ -8,7 +8,7 @@ import {
   DECIMAL_PRECISION,
   HARDCODE_PRICE_TOKENS,
   networkAddresses,
-  PRICE_WHITELISTED,
+  PRICE_WHITELISTED
 } from '../consts/constants';
 import { TokenAmount } from '../entities/tokenAmount';
 import { Address, TokenValuation } from '../types';
@@ -24,6 +24,7 @@ export async function fetchPriceFromDefiLlamaAPI(id: string): Promise<BigNumber>
     })
     .catch((err: any) => {
       console.log(`unable to fetch price from DefiLlama API: ${err}`);
+      console.error(err);
       return 0;
     });
   return new BigNumber(price);
@@ -37,6 +38,7 @@ export async function fetchPriceFromCoingeckoAPI(id: string): Promise<BigNumber>
     })
     .catch((err: any) => {
       console.log(`Unable to fetch price from Coingecko API for ${id}`);
+      console.error(err);
       return { usd: 0 };
     });
 

package/src/interactors/MoneyMarket.ts

@@ -22,7 +22,8 @@ import {
   MoneyMarketDetails,
   NetworkConnection,
 } from '../types';
-import { Cache } from '../helpers/helpers';
+import { getUnderlying } from '../helpers/helpers';
+import { cache, CacheType } from 'cache-decorator';
 
 type RewardSpeeds = {
   plyRewardSupplySpeed: BN;
@@ -50,17 +51,17 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     this.underlying = new Token(underlyingAsset, helpers.getDecimal(underlyingAsset));
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getUnderlyingPrice(): Promise<BigNumber> {
     return fetchPrice(this.underlying.address, this._networkConnection.provider);
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getPlyPrice(): Promise<BigNumber> {
     return fetchPrice(consts.networkAddresses.tokens.PLY, this._networkConnection.provider);
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   protected async getRewardSpeeds(): Promise<RewardSpeeds> {
     var speeds = await this.env.auriLens.getRewardSpeeds(
       this.env.comptroller.address,
@@ -69,12 +70,12 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return speeds;
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getTotalTokenBorrowed(): Promise<TokenAmount> {
     return new TokenAmount(this.underlying, (await this.auToken.totalBorrows()).toString());
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getTotalTokenDeposited(): Promise<TokenAmount> {
     const [totalBorrow, totalCash] = await Promise.all([
       this.getTotalTokenBorrowed(),
@@ -88,7 +89,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     );
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getDepositAPY(): Promise<BigNumber> {
     const supplyRatePerTimestamp = await this.auToken.supplyRatePerTimestamp();
     const supplyRatePerDay = new BigNumber(supplyRatePerTimestamp.toString())
@@ -98,7 +99,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return new BigNumber(supplyRatePerDay.plus(1)).pow(365).minus(1);
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getBorrowAPY(): Promise<BigNumber> {
     const borrowRatePerTimestamp = await this.auToken.borrowRatePerTimestamp();
     const borrowRatePerDay = new BigNumber(borrowRatePerTimestamp.toString())
@@ -107,14 +108,14 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return new BigNumber(borrowRatePerDay.plus(1)).pow(365).minus(1);
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getCollateralRatio(): Promise<BigNumber> {
     return this.env.comptroller.markets(this.auToken.address).then((res: any) => {
       return new BigNumber(res.collateralFactorMantissa.toString()).div(helpers.decimalFactor(18));
     });
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getBorrowPlyAPY(): Promise<BigNumber> {
     const [totalBorrowed, rewardSpeeds, plyPrice, underlyingPrice] = await Promise.all([
       this.getTotalTokenBorrowed(),
@@ -132,7 +133,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     );
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getDepositPlyAPY(): Promise<BigNumber> {
     const [totalDeposited, rewardSpeeds, plyPrice, underlyingPrice] = await Promise.all([
       this.getTotalTokenDeposited(),
@@ -150,7 +151,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     );
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getDepositNearAPY(): Promise<BigNumber> {
     const [totalDeposited, underlyingPrice] = await Promise.all([
       this.getTotalTokenDeposited(),
@@ -164,7 +165,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return depositNEARApy;
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getBorrowNearAPY(): Promise<BigNumber> {
     const [totalBorrowed, underlyingPrice] = await Promise.all([
       this.getTotalTokenBorrowed(),
@@ -178,7 +179,7 @@ export class MoneyMarketRead extends BlockchainEntityRead {
     return borrowNEARApy;
   }
 
-  @Cache(CACHE_TIMEOUT)
+  @cache({ ttl: CACHE_TIMEOUT, type: CacheType.MEMO })
   public async getDepositMetaAPY(): Promise<BigNumber> {
     const [totalDeposited, underlyingPrice] = await Promise.all([
       this.getTotalTokenDeposited(),

package/src/interactors/PlyGame.ts

@@ -131,6 +131,15 @@ export class PlyGameRead extends BlockchainEntityRead {
       amount: new TokenAmount(this.plyToken, result.amount.toString()),
     };
   }
+
+  public async overallLeaderboard(): Promise<PlyGameLeaderboardItem[]> {
+    const result = await AuriAPI.getPaginatedApi('/plygame/overallLeaderboard');
+    return result.items.map((item) => ({
+      player: item.user,
+      unlockedPulpAmount: new TokenAmount(this.pulpToken, item.unlockedAmount!),
+      gamesPlayed: item.count!,
+    }));
+  }
 }
 
 export class PlyGameReadWrite extends PlyGameRead {