@aurigami/sdk 1.5.10 → 1.6.0

package/src/{airdrop-lottery.ts → contracts/airdrop-lottery.ts}

@@ -1,28 +1,21 @@
-import { Provider } from '@ethersproject/abstract-provider';
-import { TransactionResponse } from '@ethersproject/abstract-provider';
-import { BlockchainEntity, BlockchainEntityRead } from './BlockchainEntity';
-import { Address, NetworkConnection } from './types';
-import { BigNumber as BN, Contract, utils } from 'ethers';
-import { TransferEventQuery } from './transfer-event-query';
-import {
-  AIRDROP_START_TIMESTAMP,
-  AIRDROP_KEEP_THRESHOLD,
-  AIRDROP_END_TIMESTAMP,
-  networkAddresses,
-} from './constants';
 import AuriAirdropABI from '@aurigami/contracts/artifacts/contracts/AuriAirdrop.sol/AuriAirdrop.json';
-import {
-  getBlockBeforeTimestamp,
-  getCurrentTimestamp,
-  getDecimal,
-  isSameAddress,
-  assert,
-} from './helpers';
-import AIRDROP_AUTOKEN_INFO from './airdrop_misc/auTokensInfo.json';
-import AIRDROP_WHITELIST_ADDRESSES from './airdrop_misc/whitelist.json';
 import { AuriAirdrop } from '@aurigami/contracts/typechain';
-import { TokenAmount } from './tokenAmount';
-import { Token } from './token';
+import {
+  Provider,
+  TransactionResponse,
+} from '@ethersproject/abstract-provider';
+import { BigNumber as BN, Contract, utils } from 'ethers';
+import * as consts from '../consts';
+import {
+  BlockchainEntity,
+  BlockchainEntityRead,
+  Token,
+  TokenAmount,
+} from '../entities';
+import * as helpers from '../helpers';
+import AIRDROP_AUTOKEN_INFO from '../misc/airdrop_misc/auTokensInfo.json';
+import AIRDROP_WHITELIST_ADDRESSES from '../misc/airdrop_misc/whitelist.json';
+import { Address, NetworkConnection } from '../types';
 
 type AirdropUnderlyingInfo = {
   minDeposit: BN;
@@ -40,9 +33,9 @@ class AirdropSettings {
 
   airdropStartBlock: number = 0;
   airdropEndBlock: number = 0;
-  airdropStartTimestamp: number = AIRDROP_START_TIMESTAMP;
-  airdropEndTimestamp: number = AIRDROP_END_TIMESTAMP;
-  airdropThreshold: number = AIRDROP_KEEP_THRESHOLD;
+  airdropStartTimestamp: number = consts.AIRDROP_START_TIMESTAMP;
+  airdropEndTimestamp: number = consts.AIRDROP_END_TIMESTAMP;
+  airdropThreshold: number = consts.AIRDROP_KEEP_THRESHOLD;
   private constructor() {}
 
   public static async getSettings(
@@ -52,12 +45,12 @@ class AirdropSettings {
 
     let settings: AirdropSettings = new AirdropSettings();
 
-    settings.airdropStartBlock = await getBlockBeforeTimestamp(
+    settings.airdropStartBlock = await helpers.getBlockBeforeTimestamp(
       provider,
       settings.airdropStartTimestamp
     );
 
-    settings.airdropEndBlock = await getBlockBeforeTimestamp(
+    settings.airdropEndBlock = await helpers.getBlockBeforeTimestamp(
       provider,
       settings.airdropEndTimestamp
     );
@@ -68,14 +61,14 @@ class AirdropSettings {
 }
 
 class AirdropAuTokenKeepTracker extends BlockchainEntityRead {
-  private _transferQuery: TransferEventQuery;
+  private _transferQuery: helpers.TransferEventQuery;
   private _airdropAuTokenInfo: AirdropAuTokenInfo;
   public constructor(
     networkConnection: NetworkConnection,
     airdropAuTokenInfo: AirdropAuTokenInfo
   ) {
     super(networkConnection);
-    this._transferQuery = new TransferEventQuery(
+    this._transferQuery = new helpers.TransferEventQuery(
       airdropAuTokenInfo.address,
       networkConnection
     );
@@ -147,10 +140,10 @@ class AirdropAuTokenKeepTracker extends BlockchainEntityRead {
     );
 
     for (let { from, to, amount, blockNumber } of events) {
-      if (isSameAddress(from, address)) {
+      if (helpers.isSameAddress(from, address)) {
         balance = balance.sub(amount);
       }
-      if (isSameAddress(to, address)) {
+      if (helpers.isSameAddress(to, address)) {
         balance = balance.add(amount);
       }
 
@@ -183,7 +176,7 @@ class AirdropAuTokenKeepTracker extends BlockchainEntityRead {
     if (flag == ABOVE) {
       const timestamp = Math.min(
         settings.airdropEndTimestamp,
-        getCurrentTimestamp()
+        helpers.getCurrentTimestamp()
       );
       return (
         timestamp - lastEligibleBalanceTimestamp >= settings.airdropThreshold
@@ -201,7 +194,7 @@ export class AirdropRead extends BlockchainEntityRead {
   public constructor(networkConnection: NetworkConnection) {
     super(networkConnection);
     this._airDrop = new Contract(
-      networkAddresses.misc.AURI_AIRDROP,
+      consts.networkAddresses.misc.AURI_AIRDROP,
       AuriAirdropABI.abi,
       networkConnection.provider
     ) as AuriAirdrop;
@@ -246,7 +239,7 @@ export class AirdropRead extends BlockchainEntityRead {
       this._networkConnection.provider
     );
 
-    if (getCurrentTimestamp() < settings.airdropStartTimestamp) {
+    if (helpers.getCurrentTimestamp() < settings.airdropStartTimestamp) {
       return false;
     }
 
@@ -272,7 +265,7 @@ export class AirdropRead extends BlockchainEntityRead {
     token: Address,
     user: Address
   ): Promise<TokenAmount> {
-    let tokenInstance: Token = new Token(token, getDecimal(token));
+    let tokenInstance: Token = new Token(token, helpers.getDecimal(token));
 
     let rewards: BN = await this._airDrop.getRedeemableReward(
       utils.formatBytes32String(campaign),
@@ -292,7 +285,7 @@ export class AirdropReadWrite extends AirdropRead {
     campaigns: string[],
     tokens: Address[]
   ): Promise<TransactionResponse> {
-    assert(
+    helpers.assert(
       campaigns.length == tokens.length,
       'campaigns and tokens must have the same length'
     );

package/src/contracts/index.ts

@@ -0,0 +1,4 @@
+export * from './airdrop-lottery';
+export * from './MoneyMarket';
+export * from './Papermill';
+export * from './Staking';

package/src/{BlockchainEntity.ts → entities/BlockchainEntity.ts}

@@ -1,5 +1,5 @@
 import { Signer } from '@ethersproject/abstract-signer';
-import { NetworkConnection } from './types';
+import { NetworkConnection } from '../types';
 
 export class BlockchainEntityRead {
   protected _networkConnection: NetworkConnection;

package/src/entities/index.ts

@@ -0,0 +1,3 @@
+export * from './BlockchainEntity';
+export * from './token';
+export * from './tokenAmount';

package/src/{token.ts → entities/token.ts}

@@ -1,5 +1,5 @@
-import { getDecimal } from './helpers';
-import { networkAddresses } from './constants';
+import { getDecimal } from '../helpers/helpers';
+import { networkAddresses } from '../consts/constants';
 
 export class Token {
   public readonly address: string;

package/src/{tokenAmount.ts → entities/tokenAmount.ts}

@@ -1,7 +1,7 @@
 import { Token } from './token';
 import BigNumber from 'bignumber.js';
-import { decimalFactor, getDecimal } from './helpers';
-import { Address } from './types';
+import { decimalFactor, getDecimal } from '../helpers/helpers';
+import { Address } from '../types';
 
 export class TokenAmount {
   public readonly token: Token;

package/src/{helpers.ts → helpers/helpers.ts}

@@ -2,8 +2,8 @@ import { Provider } from '@ethersproject/abstract-provider';
 import BigNumber from 'bignumber.js';
 import { BigNumber as BN, utils } from 'ethers';
 import { getQuery as getAuroraAPIQuery } from './aurora-api-helpers';
-import { decimalRecords } from './decimals';
-import { Address } from './types';
+import { decimalRecords } from '../consts/decimals';
+import { Address } from '../types';
 
 export function assert(condition: boolean, message: string = ''): void {
   if (!condition) {
@@ -89,3 +89,9 @@ export async function getBlockBeforeTimestamp(
   // use the last block number
   return parseInt(result) || (await provider.getBlockNumber());
 }
+
+export function devLog(message?: any, ...optionalParams: any[]): void {
+  if ('production' !== process.env.NODE_ENV) {
+    console.log(message, ...optionalParams);
+  }
+}

package/src/helpers/index.ts

@@ -0,0 +1,4 @@
+export * from './aurora-api-helpers';
+export * from './helpers';
+export * from './priceFetcher';
+export * from './transfer-event-query';

package/src/{priceFetcher.ts → helpers/priceFetcher.ts}

@@ -4,13 +4,19 @@ import {
   DECIMAL_PRECISION,
   networkAddresses,
   PRICE_WHITELISTED,
-} from './constants';
-import OracleABI from './abis/Oracle.json';
-import { isSameAddress, decimalFactor, getDecimal, assert } from './helpers';
+} from '../consts/constants';
+import OracleABI from '../abis/Oracle.json';
+import {
+  isSameAddress,
+  decimalFactor,
+  getDecimal,
+  assert,
+  devLog,
+} from './helpers';
 import { IUniswapV2Pair, PriceOracle } from '@aurigami/contracts/typechain';
-import { TokenAmount } from './tokenAmount';
-import { Address, TokenValuation } from './types';
-import IUniswapV2PairABI from './abis/IUniswapV2Pair.json';
+import { TokenAmount } from '../entities/tokenAmount';
+import { Address, TokenValuation } from '../types';
+import IUniswapV2PairABI from '../abis/IUniswapV2Pair.json';
 import AuriLensABI from '@aurigami/contracts/artifacts/contracts/AuriLens.sol/AuriLens.json';
 import axios from 'axios';
 
@@ -114,14 +120,16 @@ export async function fetchLPPrice(
       address: LPInfo.token0,
       reserve: LPInfo.reserve0,
     });
-  } catch {
+  } catch (e) {
+    devLog(`fetchLPPriceBy ${LPInfo.token0} failed`, e);
     try {
       // MUST await here
       return await fetchLPPriceBy({
         address: LPInfo.token1,
         reserve: LPInfo.reserve1,
       });
-    } catch {
+    } catch (e) {
+      devLog(`fetchLPPriceBy ${LPInfo.token1} failed`, e);
       throw Error(`Unable to fetch price for both tokens of LP ${address}`);
     }
   }

package/src/{transfer-event-query.ts → helpers/transfer-event-query.ts}

@@ -1,5 +1,5 @@
-import { BlockchainEntityRead } from './BlockchainEntity';
-import { NetworkConnection } from './types';
+import { BlockchainEntityRead } from '../entities/BlockchainEntity';
+import { NetworkConnection } from '../types';
 import { AuToken } from '@aurigami/contracts/typechain';
 import AuTokenABI from '@aurigami/contracts/artifacts/contracts/AuToken.sol/AuToken.json';
 import { BigNumber as BN, Contract } from 'ethers';

package/src/index.ts

@@ -5,16 +5,9 @@ import { Logger } from 'ethers/lib/utils';
 ethers.utils.Logger.setLogLevel(Logger.levels.ERROR);
 BigNumber.config({ DECIMAL_PLACES: 50 });
 
-export * from './SDK';
-export * from './MoneyMarket';
-export * from './BlockchainEntity';
+export * from './consts';
+export * from './contracts';
+export * from './entities';
 export * from './helpers';
-export * from './constants';
-export * from './dummy';
-export * from './priceFetcher';
-export * from './token';
-export * from './tokenAmount';
 export * from './types';
-export * from './airdrop-lottery';
-export * from './transfer-event-query';
-export * from './Papermill';
+export * from './SDK';

package/src/{types.ts → types/index.ts}

@@ -1,5 +1,5 @@
 import type { BigNumber, providers, Signer } from 'ethers';
-import { TokenAmount } from './tokenAmount';
+import { TokenAmount } from '../entities/tokenAmount';
 
 export enum ComptrollerRewardType {
   PLY = 0,

package/src/airdrop_misc/whitelist.example.txt

@@ -1,4 +0,0 @@
-0x2b285e1b49ba0cb6f71d8b0d9cafdfbf9868fda9
-0xe8e9a0a2571299a0dabcaae98608352faf533e6a
-0xb3539af6596d8e08f75e96452d92bc17e3cdffc0
-0x0c5a5bd45078916ff5ff3acafeb19fe96fd747dc

package/src/deployments/aurora_mainnet.json

@@ -1,31 +0,0 @@
-{
-  "deployer": "0xb969526EBc8dd4b1d816Da846eE08180515fFBbC",
-  "unitroller": "0x817af6cfAF35BdC1A634d6cC94eE9e4c68369Aeb",
-  "comptrollerImpl": "0x559c68b1276d070CB9d6Da75ECeA90FFB6497b18",
-  "comptroller": "0x817af6cfAF35BdC1A634d6cC94eE9e4c68369Aeb",
-  "PLY": "0x09c9d464b58d96837f8d8b6f4d9fe4ad408d3a4f",
-  "jumpRateModel": "0x0Bc03bd8d4aF1e8bab2194860268F5774C9d400a",
-  "oracle": "0xC6e5185438e1730959c1eF3551059A3feC744E90",
-  "auTokens": {
-    "USDC": "0x4f0d864b1ABf4B701799a0b30b57A22dFEB5917b",
-    "ETH": "0xca9511B610bA5fc7E311FDeF9cE16050eE4449E9",
-    "WBTC": "0xCFb6b0498cb7555e7e21502E0F449bf28760Adbb",
-    "USDT": "0xaD5A2437Ff55ed7A8Cad3b797b3eC7c5a19B1c54",
-    "DAI": "0xCE4166363E3a584DAc84A47bCD3414B43EfCDd1c",
-    "WNEAR": "0xaE4fac24dCdAE0132C6d04f564dCf059616E9423",
-    "STNEAR": "0x3195949f267702723bc614cAE037cdc8D1E94786",
-    "AURORA": "0x8888682E24dd4Df7B7Ff2B91fccB575737E433bf",
-    "TRI": "0x6Ea6C03061bDdCE23d4Ec60B6E6e880c33d24dca",
-    "PLY": "0xC9011e629c9d0b8B1e4A2091e123fBB87B3A792c"
-  },
-  "fairLaunch": "0xC9A848AC73e378516B16E4EeBBa5ef6aFbC0BBc2",
-  "auriLens": "0xFfdFfBDB966Cb84B50e62d70105f2Dbf2e0A1e70",
-  "ethRepayHelper": "0xa308A5003fA1A25BFdD9418FcEE51d48Dbe441e6",
-  "configReader": "0x347B321c466663D6A0fE9C0ccfCF8cEa86F8ecD3",
-  "auriAirdropImpl": "0x94cdA0Da833b384B901d33D5c56FccDE21D5E6e7",
-  "auriAirdrop": "0x6C42aA5b128B62D6CCf357726D7d13F3888335EC",
-  "ply_wnear_lp": "0x044b6B0CD3Bb13D2b9057781Df4459C66781dCe7",
-  "PULP": "0x04Ac48711BCdc45b4d223fb021E09DA73c71095e",
-  "plyTokenLock": "0x5715C45D2C82292D8e5961Eb5e2C66fe0Fc5412B",
-  "test": {}
-}

package/src/deployments/aurora_testnet.json

@@ -1,31 +0,0 @@
-{
-    "networkId": 1313161555,
-    "deployer": "0x42D2D78Cc14e1B7D5e317B42e5335D8816B4Fd3F",
-    "unitroller": "0x1626d7941DF19781657a921014597c449F86941e",
-    "comptroller": "0x06200C8331193241e6487235C1E8a1340fcc9C1A",
-    "ply": "0x84B5C41DC786316c5aA319B5A22CA77472e1d31f",
-    "tokenLock": "0xc77E562C41ec3Ce860b5424758B77ad0aDb1bB93",
-    "lens": "0x680e15080Df9ff61131499D21aa5Ca9Bd05E60e0",
-    "fairLaunch": "0x4e91CdfeA23f44D4269E66494fe532867a0fAe5E",
-    "oracle": "0xe0E2Bb669a75Ae2384371cB4c4c95ff6fC1581b0",
-    "interestRateModel": "0x7346c735bce0c4838A917AFa9879F7723f1bB963",
-    "auTokens": {
-        "USDC": "0x1c7EB2ADdC2df2F28E9631cce970D2E2DF22429A",
-        "ETH": "0xdaE860b77c26498e7Bd8e16Fb80AD572FaB9688f",
-        "WBTC": "0x5329f32A9dDaC3d274Cc670B284561b0086D2244",
-        "USDT": "0x57E15Bf9Bc4c8a7AFd3C8DBE153ED29eC90B68Fa",
-        "DAI": "0xdCdA4c7eF408961200193d7180357AEC404C267A",
-        "PLY": "0xa8474c18f502551937367120a6D8453dA785f1DD",
-        "WNEAR": "0x2Db190F0Db94E78B87D805e022D2a07803652211"
-    },
-    "supportedTokens": {
-        "USDC": "0x3dcB6AdF46E4d854E94719b6ed9cfab6939cC1Cb",
-        "WBTC": "0x6fF98E346Ba4C56fBc3Ebc3f92477ffCe09D96AB",
-        "USDT": "0x05b8777B6c280DB4E61CF0F63d59b4Ac8ec70538",
-        "DAI": "0xd94951E6B276fD4327FFBD3253b6307d112403e2",
-        "PLY": "0x84B5C41DC786316c5aA319B5A22CA77472e1d31f",
-        "WNEAR": "0xb2cBCe33a6fb7D2efFb1cF73A654a4c0c9255874"
-    },
-    "PLY_AUR_LP": "",
-    "faucet": "0x8F791d611D71699B76C03857A51D7B7E5E66f01E"
-}