@aurigami/sdk 1.12.0-beta5 → 1.12.0

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.12.0-beta5",
+    "version": "1.12.0",
     "license": "MIT",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
@@ -62,7 +62,7 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "@aurigami/contracts": "3.11.3",
+        "@aurigami/contracts": "3.12.0-beta-4",
         "axios": "^0.26.1",
         "bignumber.js": "^9.0.2",
         "ethers": "^5.6.4"
@@ -70,4 +70,4 @@
     "jest": {
         "testURL": "https://app.aurigami.finance"
     }
-}
+}

package/src/a.ts.log

@@ -0,0 +1,29 @@
+import { AuToken } from '@aurigami/contracts/typechain';
+import { ethers } from 'ethers';
+import { AuriEnv, formatObject, getDecimal, MAINNET_ADDRESSES, networkAddresses, SDK, Token } from '../src';
+import { ask } from 'stdio';
+const AURORA_DEFAULT_PROVIDER_URL = `https://mainnet.aurora.dev/`;
+
+const AURORA_DEFAULT_PROVIDER = new ethers.providers.JsonRpcProvider(
+  AURORA_DEFAULT_PROVIDER_URL
+ );
+
+ async function foo(contract: AuToken, block: number) {
+  let data = await contract.callStatic.borrowBalanceCurrent('0x25a087dc3512e3be548f0ca13233ae29d3781bdc', {blockTag: block});
+  console.log("c", data.toString());
+  data = await contract.callStatic.borrowBalanceStored('0x25a087dc3512e3be548f0ca13233ae29d3781bdc', {blockTag: block});
+  console.log("s", data.toString());
+ }
+
+async function main() {
+  let env = new AuriEnv({ provider: AURORA_DEFAULT_PROVIDER });
+  let contract = env.getAuErc20Contract({address: MAINNET_ADDRESSES.auTokens.USDC});
+  // let block = 60596417;
+  // while (true) {
+  //   block = parseInt(eval(await ask('block')));
+  //   if (block == 0) break;
+  //   await foo(contract, block);
+  // }
+}
+
+main();

package/src/abis/index.ts

@@ -13,7 +13,7 @@ import AuriInternalLensABI from '@aurigami/contracts/artifacts/contracts/mock/Au
 import IUniswapV2PairABI from '@aurigami/contracts/artifacts/contracts/mock/IUniswapV2Pair.sol/IUniswapV2Pair.json';
 import Multicall2ABI from '@aurigami/contracts/artifacts/contracts/mock/Multicall2.sol/Multicall2.json';
 import PulpABI from '@aurigami/contracts/artifacts/contracts/PULP.sol/PULP.json';
-import ReferralDirectoryV2ABI from '@aurigami/contracts/artifacts/contracts/ReferralDirectoryV2.sol/ReferralDirectoryV2.json';
+import ReferralDirectoryABI from '@aurigami/contracts/artifacts/contracts/ReferralDirectory.sol/ReferralDirectory.json';
 import PlyGameABI from '@aurigami/contracts/artifacts/contracts/plygame/PlyGame.sol/PlyGame.json';
 export {
   AuriOracleABI,
@@ -25,7 +25,7 @@ export {
   ComptrollerABI,
   // FaucetABI,
   EIP20InterfaceABI,
-  ReferralDirectoryV2ABI,
+  ReferralDirectoryABI,
   AuErc20ABI,
   AuETHABI,
   EthRepayHelperABI,

package/src/consts/constants.ts

@@ -91,7 +91,6 @@ export const networkAddresses: NetworkAddresses = {
     PULP_CONTRACT: '0x04ac48711bcdc45b4d223fb021e09da73c71095e'.toLowerCase(),
     PLY_TOKEN_LOCK: MAINNET_ADDRESSES.plyTokenLock.toLowerCase(),
     REFERRAL: MAINNET_ADDRESSES.referralDirectory.toLowerCase(),
-    REFERRAL_V2: '0xCECd147409B2d64A9A2E5418e3E471E8af19E0bd'.toLowerCase(),
     AURI_INTERNAL_LENS: MAINNET_ADDRESSES.auriInternalLens.toLowerCase(),
     PLYGAME: MAINNET_ADDRESSES.plyGame.toLowerCase(),
   },

package/src/entities/auriEnv.ts

@@ -9,7 +9,7 @@ import {
   IERC20,
   PlyGame,
   PULP,
-  ReferralDirectoryV2,
+  ReferralDirectory,
 } from '@aurigami/contracts/typechain';
 import { Contract } from 'ethers';
 import { assert } from '../helpers/helpers';
@@ -26,7 +26,7 @@ export class AuriEnv extends BlockchainEntityRead {
   private _pulp: PULP | null = null;
   private _auriInternalLens: AuriInternalLens | null = null;
   private _auriAirdrop: AuriAirdrop | null = null;
-  private _referralDirectoryV2: ReferralDirectoryV2 | null = null;
+  private _referralDirectory: ReferralDirectory | null = null;
   private _oracle: AuriOracle | null = null;
   private _plygame: PlyGame | null = null;
 
@@ -137,14 +137,14 @@ export class AuriEnv extends BlockchainEntityRead {
     return this._auriAirdrop;
   }
 
-  get referralDirectoryV2(): ReferralDirectoryV2 {
-    if (!this._referralDirectoryV2) {
-      this._referralDirectoryV2 = this.getContract<ReferralDirectoryV2>(
-        networkAddresses.misc.REFERRAL_V2,
-        abis.ReferralDirectoryV2ABI.abi
+  get referralDirectory(): ReferralDirectory {
+    if (!this._referralDirectory) {
+      this._referralDirectory = this.getContract<ReferralDirectory>(
+        networkAddresses.misc.REFERRAL,
+        abis.ReferralDirectoryABI.abi
       );
     }
-    return this._referralDirectoryV2;
+    return this._referralDirectory;
   }
 
   get oracle(): AuriOracle {

package/src/interactors/Referral.ts

@@ -1,12 +1,7 @@
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import axios from 'axios';
 import { ethers } from 'ethers';
-import {
-  AURORA_PLUS_API_PREFIX,
-  referralRewardDummy1,
-  referralRewardDummy2,
-  REFERRAL_CAMPAIGNS,
-} from '../consts';
+import { AURORA_PLUS_API_PREFIX, REFERRAL_CAMPAIGNS } from '../consts';
 import { AuriEnv, BlockchainEntity, BlockchainEntityRead, TokenAmount } from '../entities';
 import { getBlocksTimestamp } from '../helpers';
 import * as AuriAPI from '../helpers/aurigami-api';
@@ -39,7 +34,7 @@ export class ReferralRead extends BlockchainEntityRead {
    * Called to check if a user has a referral code.
    */
   public async getUserReferralCode(userAddr: Address): Promise<string> {
-    const result = await this.env.referralDirectoryV2.userReferralCode(userAddr);
+    const result = await this.env.referralDirectory.userReferralCode(userAddr);
     return ethers.utils.parseBytes32String(result);
   }
 
@@ -47,7 +42,7 @@ export class ReferralRead extends BlockchainEntityRead {
    * Get referral code that a user was referred by, returns empty string if not found.
    */
   public async getReferralCodeUsed(userAddr: Address): Promise<string> {
-    const result = await this.env.referralDirectoryV2.referralCodeUsed(userAddr);
+    const result = await this.env.referralDirectory.referralCodeUsed(userAddr);
     return ethers.utils.parseBytes32String(result);
   }
 
@@ -56,7 +51,7 @@ export class ReferralRead extends BlockchainEntityRead {
    */
   public async getReferralCodeOwner(code: string): Promise<Address> {
     const referralCode = ethers.utils.formatBytes32String(code);
-    return this.env.referralDirectoryV2.referralCodeOwner(referralCode);
+    return this.env.referralDirectory.referralCodeOwner(referralCode);
   }
 
   /**
@@ -89,7 +84,6 @@ export class ReferralRead extends BlockchainEntityRead {
       refereeAddress: null,
     }));
 
-    items = [referralRewardDummy1, referralRewardDummy2, ...items];
     return items;
   }
 
@@ -144,8 +138,8 @@ export class ReferralRead extends BlockchainEntityRead {
   }
 
   public async isWhitelistedAddress(address: Address): Promise<boolean> {
-    let result = await this.env.referralDirectoryV2.isUserWhitelisted(address);
-    return result.eq(1);
+    let result = await AuriAPI.getApi('/referral/whitelisted', { address: address });
+    return result.isWhitelisted;
   }
 
   public async isOnAuroraPlus(address: Address): Promise<boolean> {
@@ -173,7 +167,7 @@ export class ReferralReadWrite extends ReferralRead {
    */
   public async registerNewReferralCode(): Promise<TransactionResponse> {
     const referralCode = ethers.utils.formatBytes32String(this.generateReferralCode());
-    return this.env.referralDirectoryV2
+    return this.env.referralDirectory
       .connect(this._networkConnection.signer!)
       .registerNewUserReferralCode(referralCode);
   }
@@ -183,7 +177,7 @@ export class ReferralReadWrite extends ReferralRead {
    */
   public async useReferralCode(code: string): Promise<TransactionResponse> {
     const referralCode = ethers.utils.formatBytes32String(code);
-    return this.env.referralDirectoryV2
+    return this.env.referralDirectory
       .connect(this._networkConnection.signer!)
       .registerReferralCodeUsed(referralCode);
   }