@aurigami/sdk 1.11.0-beta2 → 1.11.0-beta4

package/dist/types/index.d.ts

@@ -141,9 +141,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.11.0-beta2",
+    "version": "1.11.0-beta4",
     "license": "MIT",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",

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';
@@ -160,3 +162,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, 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)));
   }
 

package/src/types/index.ts

@@ -159,9 +159,9 @@ export type PlyGameBetResult = {
    */
   outcome: string;
   /**
-   * Bet amount
+   * ply lost amount
    */
-  amount: TokenAmount;
+  lostAmount: TokenAmount;
   unlockedPulpAmount: TokenAmount;
 
   block: number;