@aurigami/sdk 1.12.0-beta1 → 1.12.0-beta2

package/dist/types/index.d.ts

@@ -133,6 +133,7 @@ export declare type ReferralReward = {
      * hash of the transaction on aurorascan (if no, return null)
      */
     transactionHash: string | null;
+    refereeAddress: string | null;
 };
 export declare type PlyGameBetResult = {
     player: string;
@@ -141,9 +142,9 @@ export declare type PlyGameBetResult = {
      */
     outcome: string;
     /**
-     * Bet amount
+     * ply lost amount
      */
-    amount: TokenAmount;
+    lostAmount: TokenAmount;
     unlockedPulpAmount: TokenAmount;
     block: number;
     timestamp: number;

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.12.0-beta1",
+    "version": "1.12.0-beta2",
     "license": "MIT",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
@@ -62,7 +62,7 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "@aurigami/contracts": "3.12.0-beta-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/consts/constants.ts

@@ -92,7 +92,7 @@ export const networkAddresses: NetworkAddresses = {
     PLY_TOKEN_LOCK: MAINNET_ADDRESSES.plyTokenLock.toLowerCase(),
     REFERRAL: MAINNET_ADDRESSES.referralDirectory.toLowerCase(),
     AURI_INTERNAL_LENS: MAINNET_ADDRESSES.auriInternalLens.toLowerCase(),
-    PLYGAME: '0x60bf668CA101060BD83BD644531a38719586B89f'.toLowerCase(), // TODO: FIX THIS AFTER PLY GAME IS DEPLOYED
+    PLYGAME: MAINNET_ADDRESSES.plyGame.toLowerCase(),
   },
   tokens: {
     AURORA: '0x8bec47865ade3b172a928df8f990bc7f2a3b9f79'.toLowerCase(),

package/src/consts/dummy.ts

@@ -30,20 +30,22 @@ export const dummyUserMarketDetails: UserMarketDetails = {
 
 export const referralRewardDummy1: ReferralReward = {
   campaign: 'testa',
-  startTime: 1652882400, // May 18, 2022 2:00:00 PM
-  endTime: 1653573599, // May 26, 2022 1:59:59 PM
+  startTime: Math.trunc(new Date(2022, 8, 1).getTime() / 1000),
+  endTime: Math.trunc(new Date(2022, 9, 30).getTime() / 1000),
   isReferrer: false,
   rewardTokenAmount: dummyTokenAmount,
   transactionHash: null,
   userAddr: '0x...123',
+  refereeAddress: '0x123..123',
 };
 
 export const referralRewardDummy2: ReferralReward = {
   campaign: 'testb',
-  startTime: 1652882400, // May 18, 2022 2:00:00 PM
-  endTime: 1653573599, // May 26, 2022 1:59:59 PM
+  startTime: Math.trunc(new Date(2022, 8, 1).getTime() / 1000),
+  endTime: Math.trunc(new Date(2022, 8, 31).getTime() / 1000),
   isReferrer: true,
   rewardTokenAmount: dummyTokenAmount2,
   transactionHash: '0x4da9657663b46ef18d150b897b28c7b717f16421978b52e3a06d91b54ca3548b',
   userAddr: '0x...456',
+  refereeAddress: '0x123..123',
 };

package/src/helpers/helpers.ts

@@ -1,6 +1,8 @@
+import { TypedEvent } from '@aurigami/contracts/typechain/common';
 import { Provider } from '@ethersproject/abstract-provider';
 import BigNumber from 'bignumber.js';
 import { BigNumber as BN, utils } from 'ethers';
+import { Result } from 'ethers/lib/utils';
 import { networkAddresses } from '../consts/constants';
 import { decimalRecords } from '../consts/decimals';
 import { symbolRecords } from '../consts/symbols';
@@ -31,6 +33,12 @@ export const getCurrentTimestamp = (): number => {
   return Math.trunc(Date.now() / 1000);
 };
 
+export async function sleep(duration: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, duration);
+  });
+}
+
 export function validateAndParseAddress(address: Address): Address {
   try {
     return utils.getAddress(address);
@@ -160,3 +168,16 @@ export function devLog(message?: any, ...optionalParams: any[]): void {
     console.log('[DEV LOG]', message, ...optionalParams);
   }
 }
+
+/**
+ * Sorts (in place) an array of Events by blocknumber.
+ * This method mutates the array and returns a reference to the same array.
+ **/
+export function sortEvents<T extends Result>(events: TypedEvent<T>[]): TypedEvent<T>[] {
+  return events.sort((a, b) => {
+    if (a.blockNumber == b.blockNumber) {
+      return a.logIndex - b.logIndex;
+    }
+    return a.blockNumber - b.blockNumber;
+  });
+}

package/src/interactors/PlyGame.ts

@@ -2,7 +2,7 @@ import { TransactionResponse } from '@ethersproject/abstract-provider';
 import * as consts from '../consts';
 import { AuriEnv, BlockchainEntity, BlockchainEntityRead, Token, TokenAmount } from '../entities';
 import * as helpers from '../helpers';
-import { getBlocksTimestamp, isSameAddress } from '../helpers';
+import { getBlocksTimestamp, isSameAddress, sleep, sortEvents } from '../helpers';
 import * as AuriAPI from '../helpers/aurigami-api';
 import {
   Address,
@@ -29,11 +29,14 @@ export class PlyGameRead extends BlockchainEntityRead {
 
   private parseBetMakeEvent(event: PlyBetMadeEvent): PlyGameBetResult {
     let outcome = ['bigWin', 'win', 'lose', 'noImpact'][event.args.outcome];
-    let amount = event.args.amount;
-    let unlock = amount.mul([10, 1, 0, 0][event.args.outcome]);
+    let betAmount = event.args.amount;
+    // 0%, 0%, 100%, 2%
+    // big win, win, lose, no impact
+    let lostAmount = betAmount.mul([0, 0, 100, 2][event.args.outcome]).div(100);
+    let unlock = betAmount.mul([10, 1, 0, 0][event.args.outcome]);
     return {
       player: event.args.player,
-      amount: new TokenAmount(this.plyToken, amount.toString()),
+      lostAmount: new TokenAmount(this.plyToken, lostAmount.toString()),
       unlockedPulpAmount: new TokenAmount(this.pulpToken, unlock.toString()),
       outcome: outcome,
       transactionHash: event.transactionHash,
@@ -60,6 +63,8 @@ export class PlyGameRead extends BlockchainEntityRead {
 
     let filter = this.env.plygame.filters.BetMade(user);
     let events = await this.env.plygame.queryFilter(filter, block100.toNumber());
+    // Sort descending by block number
+    sortEvents(events).reverse();
     return this.attachTimestamp(events.map((event) => this.parseBetMakeEvent(event)));
   }
 
@@ -71,17 +76,25 @@ export class PlyGameRead extends BlockchainEntityRead {
     return new TokenAmount(this.plyToken, jackpot.toString());
   }
 
-  public async nextJackpotRevealTime(): Promise<number> {
-    return 0; // TODO: TBD
-  }
-
   public async earlyUnlockedPulpAmount(user: Address): Promise<TokenAmount> {
     let earlyUnlockedPulpAmount = await this.env.plygame.totalPlyUnlockedEarly(user);
     return new TokenAmount(this.pulpToken, earlyUnlockedPulpAmount.toString());
   }
 
   public async getPlyGameResultsInTransaction(txHash: Address): Promise<PlyGameBetResult[]> {
+    // wait for the tx to be mined if needed.
+    // Don't use `waitForTransaction` because it will wait for longer than needed.
     let tx = await this._networkConnection.provider.getTransactionReceipt(txHash);
+
+    for (let i = 0; i < 100 && !tx; i++) {
+      await sleep(1000); // Sleep for 1 second before retrying
+      tx = await this._networkConnection.provider.getTransactionReceipt(txHash);
+    }
+
+    if (!tx) {
+      throw new Error(`Transaction ${txHash} takes too long to be mined`);
+    }
+
     let filter = this.env.plygame.filters.BetMade();
     let betMadeEvents: PlyBetMadeEvent[] = tx.logs
       .filter((log) => isSameAddress(log.topics[0], filter.topics![0] as string))
@@ -108,15 +121,6 @@ export class PlyGameRead extends BlockchainEntityRead {
 }
 
 export class PlyGameReadWrite extends PlyGameRead {
-  /**
-   * makes "times" independent bets, but consecutively, of the same amount
-   */
-  public async makeBetMultiple(amount: TokenAmount, times: number): Promise<TransactionResponse> {
-    return this.env.plygame
-      .connect(this._networkConnection.signer!)
-      .makeBetMultiple(amount.rawAmount(), times);
-  }
-
   /**
    * Make a single bet
    */
@@ -125,6 +129,7 @@ export class PlyGameReadWrite extends PlyGameRead {
       .connect(this._networkConnection.signer!)
       .makeBetOnce(amount.rawAmount());
   }
+
   public async approve(amount: TokenAmount): Promise<TransactionResponse> {
     return this.env.ply
       .connect(this._networkConnection.signer!)

package/src/interactors/Referral.ts

@@ -1,7 +1,11 @@
 import { TransactionResponse } from '@ethersproject/abstract-provider';
 import axios from 'axios';
 import { ethers } from 'ethers';
-import { AURORA_PLUS_API_PREFIX, REFERRAL_CAMPAIGNS } from '../consts';
+import {
+  AURORA_PLUS_API_PREFIX, referralRewardDummy1,
+  referralRewardDummy2,
+  REFERRAL_CAMPAIGNS
+} from '../consts';
 import { AuriEnv, BlockchainEntity, BlockchainEntityRead, TokenAmount } from '../entities';
 import { getBlocksTimestamp } from '../helpers';
 import * as AuriAPI from '../helpers/aurigami-api';
@@ -73,7 +77,7 @@ export class ReferralRead extends BlockchainEntityRead {
    */
   public async referralRewards(userAddr: Address): Promise<ReferralReward[]> {
     const result = await AuriAPI.getPaginatedApi('/referral/rewards', { address: userAddr });
-    const items: ReferralReward[] = result.items.map((item, i) => ({
+    let items: ReferralReward[] = result.items.map((item, i) => ({
       campaign: item.campaign!,
       userAddr: userAddr,
       isReferrer: (item.campaign as string).includes('referrer'),
@@ -81,7 +85,10 @@ export class ReferralRead extends BlockchainEntityRead {
       startTime: REFERRAL_CAMPAIGNS[item.campaign].start,
       endTime: REFERRAL_CAMPAIGNS[item.campaign].end,
       transactionHash: item.transactionHash ?? null,
+      refereeAddress: null,
     }));
+
+    items = [referralRewardDummy1, referralRewardDummy2, ...items];
     return items;
   }
 
@@ -98,11 +105,36 @@ export class ReferralRead extends BlockchainEntityRead {
       startTime: REFERRAL_CAMPAIGNS[item.campaign].start,
       endTime: REFERRAL_CAMPAIGNS[item.campaign].end,
       transactionHash: null,
+      refereeAddress: null,
     }));
     items.sort((a, b) => b.rewardTokenAmount.compare(a.rewardTokenAmount));
     return items;
   }
 
+  /**
+   * current number of slots under a referral code being used that exceed minimum deposit amount
+   */
+  public async slotsInUse(referralCode: string): Promise<number> {
+    return 123;
+  }
+
+  public totalReferralSlots() {
+    return 500;
+  }
+
+  /**
+   * a way to determine qualification status of a user. null if not referred yet,
+   * qualified if referred + min deposit, notQualified if referred + min deposit
+   * not reached or withdrew too early
+   */
+  public async userReferralStatus(userAddr: Address): Promise<string> {
+    if ((await this.getReferralCodeUsed(userAddr)) !== '') {
+      return 'notQualified';
+    } else {
+      return 'notReferred';
+    }
+  }
+
   public async isWhitelistedAddress(address: Address): Promise<boolean> {
     let result = await AuriAPI.getApi('/referral/whitelisted', { address: address });
     return result.isWhitelisted;

package/src/types/index.ts

@@ -150,6 +150,8 @@ export type ReferralReward = {
    * hash of the transaction on aurorascan (if no, return null)
    */
   transactionHash: string | null;
+
+  refereeAddress: string | null;
 };
 
 export type PlyGameBetResult = {
@@ -159,9 +161,9 @@ export type PlyGameBetResult = {
    */
   outcome: string;
   /**
-   * Bet amount
+   * ply lost amount
    */
-  amount: TokenAmount;
+  lostAmount: TokenAmount;
   unlockedPulpAmount: TokenAmount;
 
   block: number;

package/src/a.ts.log

@@ -1,29 +0,0 @@
-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();