shufflecom-calculations 6.0.0 → 6.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shufflecom-calculations",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -12,10 +12,9 @@
     "bignumber.js": "^11.x",
     "bs58": "^6.0.0",
     "dayjs": "^1.x",
-    "lodash": "^4.x",
-    "stdnum": "^1.12.6"
+    "lodash": "^4.x"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "ccd541450a6821c11fb2a73299710a766fd81f49"
+  "gitHead": "cf8a037f371d7155f6aa0d69c936ba0e8e54d2d8"
 }

package/src/airdrop/airdrop-calculator.ts

@@ -96,10 +96,6 @@ export class AirdropCalculator {
     return dayjs(distributionDate).subtract(1, 'week').add(1, 'minute').toDate();
   }
 
-  static hasNextEventStarted(distributionDate: Date): boolean {
-    return dayjs.utc().isAfter(dayjs.utc(distributionDate).add(1, 'minute'));
-  }
-
   /**
    * @decription calculates the points without limit on decimal places
    * @note: default round down to 2 decimal places

package/src/fiat-document/index.ts

@@ -1,8 +1,3 @@
-import * as arCuit from 'stdnum/lib/cjs/ar/cuit';
-import * as brCpf from 'stdnum/lib/cjs/br/cpf';
-import * as mxCurp from 'stdnum/lib/cjs/mx/curp';
-import { CPF_REGEX, CUIL_CUIT_REGEX, CURP_REGEX } from '../regex';
-
 /**
  * Government-issued documents collected for fiat payments.
  */
@@ -11,95 +6,3 @@ export enum FiatDocumentType {
   CURP = 'CURP',
   CUIL_CUIT = 'CUIL_CUIT',
 }
-
-export type FiatDocumentColumn = 'cpf' | 'curp' | 'cuilCuit';
-
-export type FiatDocumentSpec = {
-  /** Column on user_fiat_information holding this document. */
-  column: FiatDocumentColumn;
-  pattern: RegExp;
-  /** Strips separators and upper-cases. */
-  compact: (value: string) => string;
-  /** Opposite of compact */
-  format: (value: string) => string;
-  /**
-   * Issuer check-digit validation of the compacted value, applied on top of `pattern`.
-   */
-  checksum?: (value: string) => boolean;
-};
-
-/**
- * Repeated digits pass the CPF checksum but must be explicitly rejected
- * https://lookuptax.com/docs/how-to-verify/cpf-verification-brazil
- */
-const CPF_REPEATED_DIGITS = /^(\d)\1+$/;
-
-function hasValidCpfCheckDigit(value: string): boolean {
-  return !CPF_REPEATED_DIGITS.test(value) && brCpf.validate(value).isValid;
-}
-
-/**
- * AFIP's CUIT check digit, computed here rather than via stdnum due to some algorithm updates.
- * https://lookuptax.com/docs/tax-identification-number/argentina-tax-id-guide
- */
-const CUIT_WEIGHTS = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2];
-
-function hasValidCuitCheckDigit(value: string): boolean {
-  if (value.slice(2, 10) === '00000000') return false;
-
-  const sum = CUIT_WEIGHTS.reduce((acc, weight, index) => acc + Number(value[index]) * weight, 0);
-  const remainder = 11 - (sum % 11);
-  const expected = remainder === 11 ? 0 : remainder === 10 ? 9 : remainder;
-  return expected === Number(value[10]);
-}
-
-/**
- * One row per government-issued document we collect. Adding a fiat currency that needs a new
- * document means adding a FiatDocumentType, a column, and a row here — nothing else branches
- * per country.
- */
-export const FIAT_DOCUMENT_SPECS: Record<FiatDocumentType, FiatDocumentSpec> = {
-  [FiatDocumentType.CPF]: {
-    column: 'cpf',
-    pattern: CPF_REGEX,
-    compact: brCpf.compact,
-    format: brCpf.format,
-    checksum: hasValidCpfCheckDigit,
-  },
-  [FiatDocumentType.CURP]: {
-    column: 'curp',
-    pattern: CURP_REGEX,
-    compact: mxCurp.compact,
-    format: mxCurp.format,
-    checksum: value => mxCurp.validate(value).isValid,
-  },
-  [FiatDocumentType.CUIL_CUIT]: {
-    column: 'cuilCuit',
-    pattern: CUIL_CUIT_REGEX,
-    compact: arCuit.compact,
-    format: arCuit.format,
-    checksum: hasValidCuitCheckDigit,
-  },
-};
-
-export const DOCUMENT_TYPE_TO_COLUMN: Record<FiatDocumentType, FiatDocumentColumn> = Object.fromEntries(
-  Object.entries(FIAT_DOCUMENT_SPECS).map(([type, spec]) => [type, spec.column]),
-) as Record<FiatDocumentType, FiatDocumentColumn>;
-
-const SPEC_BY_COLUMN = new Map<FiatDocumentColumn, FiatDocumentSpec>(Object.values(FIAT_DOCUMENT_SPECS).map(spec => [spec.column, spec]));
-
-export function isFiatDocumentValid(documentType: FiatDocumentType, value: string): boolean {
-  const { pattern, compact, checksum } = FIAT_DOCUMENT_SPECS[documentType];
-  const canonical = compact(value);
-  return pattern.test(canonical) && (!checksum || checksum(canonical));
-}
-
-export function compactFiatDocument(column: string, value: string): string {
-  const spec = SPEC_BY_COLUMN.get(column as FiatDocumentColumn);
-  return spec ? spec.compact(value) : value;
-}
-
-export function formatFiatDocument(column: string, value: string): string {
-  const spec = SPEC_BY_COLUMN.get(column as FiatDocumentColumn);
-  return spec ? spec.format(value) : value;
-}

package/src/regex/index.ts

@@ -25,10 +25,3 @@ export const NO_INVISIBLE_CHAR_REGEX = /^[^\u2800\uFFA0\u115F\u1160\u3164]*$/;
 export const US_PHONE_NUMBER_REGEX = /^\+1\d{10}$/;
 // E.164 international phone number: leading +, first digit 1-9, total 7-15 digits
 export const E164_PHONE_NUMBER_REGEX = /^\+[1-9]\d{6,14}$/;
-// Brazilian CPF (digits only, no formatting)
-export const CPF_REGEX = /^\d{11}$/;
-// Mexican CURP (18 alphanumeric chars)
-export const CURP_REGEX = /^[A-Z0-9]{18}$/i;
-// Argentine CUIL/CUIT: 11 digits, no formatting, leading with a valid person/entity
-// prefix (20-27 individuals, 30/33/34 legal entities)
-export const CUIL_CUIT_REGEX = /^(20|23|24|25|26|27|30|33|34)\d{9}$/;

package/src/regex/regex.spec.ts

@@ -1,6 +1,5 @@
 import {
   ADDRESS_URL_REGEX,
-  CUIL_CUIT_REGEX,
   HEX_COLOR_CODE_REGEX,
   NO_INVISIBLE_CHAR_REGEX,
   PROMOTION_CODE_REGEX,
@@ -12,25 +11,6 @@ import {
 } from '.';
 
 describe('regex', () => {
-  describe('CUIL_CUIT_REGEX', () => {
-    it('accepts 11 digits with a valid individual or entity prefix', () => {
-      expect(CUIL_CUIT_REGEX.test('20123456789')).toBe(true);
-      expect(CUIL_CUIT_REGEX.test('27123456789')).toBe(true);
-      expect(CUIL_CUIT_REGEX.test('30123456789')).toBe(true);
-    });
-
-    it('rejects an invalid leading prefix', () => {
-      expect(CUIL_CUIT_REGEX.test('19123456789')).toBe(false);
-      expect(CUIL_CUIT_REGEX.test('28123456789')).toBe(false);
-    });
-
-    it('rejects wrong length or non-digits', () => {
-      expect(CUIL_CUIT_REGEX.test('2012345678')).toBe(false); // 10 digits
-      expect(CUIL_CUIT_REGEX.test('201234567890')).toBe(false); // 12 digits
-      expect(CUIL_CUIT_REGEX.test('20-12345678-9')).toBe(false); // formatted
-    });
-  });
-
   describe('PWD_REGEX', () => {
     it('should not allow passwords with less than 8 characters', () => {
       expect(PWD_REGEX.test('abcdef1')).toBe(false);

package/src/sports/calculate-sports-payout-odd.spec.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { calculateSportsPayoutOdds, calculateSportsPayoutOddsFromLegs, getSystemBetSubBetSelections } from './calculate-sports-payout-odds';
+import { calculateSportsPayoutOddsFromLegs, getSystemBetSubBetLegs } from './calculate-sports-payout-odds';
 import {
   OutcomeResult,
   SportsBetLegInterface,
@@ -20,6 +20,7 @@ const createSelection = (
   oddsDenominator: number,
 ): SportsBetSelectionInterface => ({
   marketSelectionId,
+  sportsBetLegId: 'leg-1',
   status,
   oddsNumerator: new BigNumber(oddsNumerator),
   oddsDenominator: new BigNumber(oddsDenominator),
@@ -45,16 +46,30 @@ const createMarketSelection = (
   provider: SportsMarketProvider.GENIUS,
 });
 
-describe('calculateSportsPayoutOdds', () => {
+// A regular bet is one REGULAR leg per selection, carrying that selection's own odds
+const toRegularLegs = (selections: SportsBetSelectionInterface[]): SportsBetLegInterface[] =>
+  selections.map(selection => ({
+    type: SportsBetLegType.REGULAR,
+    oddsDecimal: selection.oddsNumerator.dividedBy(selection.oddsDenominator).plus(1),
+    selections: [selection],
+  }));
+
+// A custom bet leg carries its own combined odds and holds every selection in the combination
+const toCustomLeg = (oddsDecimal: BigNumber, selections: SportsBetSelectionInterface[]): SportsBetLegInterface => ({
+  type: SportsBetLegType.CUSTOM,
+  oddsDecimal,
+  selections,
+});
+
+describe('calculateSportsPayoutOddsFromLegs', () => {
   describe('regular bet', () => {
     describe('all selections won', () => {
       it('should calculate correct payout odds for single selection', () => {
         const selections = [createSelection('sel1', SportsBetSelectionStatus.WON, 150, 100)];
         const marketSelections = [createMarketSelection('sel1', 150, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -74,9 +89,8 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 100, 100),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -93,9 +107,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 150, 100), createMarketSelection('sel2', 200, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -109,9 +122,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 150, 100), createMarketSelection('sel2', 200, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -132,9 +144,8 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 100, 100),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -149,9 +160,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 150, 100), createMarketSelection('sel2', 200, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -168,9 +178,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 150, 100), createMarketSelection('sel2', 200, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -193,9 +202,8 @@ describe('calculateSportsPayoutOdds', () => {
           }),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -218,9 +226,8 @@ describe('calculateSportsPayoutOdds', () => {
           }),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -243,9 +250,8 @@ describe('calculateSportsPayoutOdds', () => {
           }),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -267,9 +273,8 @@ describe('calculateSportsPayoutOdds', () => {
           }),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -293,9 +298,8 @@ describe('calculateSportsPayoutOdds', () => {
           }),
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -312,9 +316,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 100, 100), createMarketSelection('sel2', 200, 100)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -336,9 +339,8 @@ describe('calculateSportsPayoutOdds', () => {
           winProbability: 0.7,
         };
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -358,9 +360,8 @@ describe('calculateSportsPayoutOdds', () => {
           halfWinProbability: 0.5,
         };
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -379,9 +380,8 @@ describe('calculateSportsPayoutOdds', () => {
           halfLoseProbability: 0.4,
         };
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -400,9 +400,8 @@ describe('calculateSportsPayoutOdds', () => {
           refundProbability: 0.3,
         };
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -418,9 +417,8 @@ describe('calculateSportsPayoutOdds', () => {
         ];
         const marketSelections = [createMarketSelection('sel1', 100, 100), createMarketSelection('sel2', 200, 100, 0.6)];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -439,9 +437,8 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel2', 200, 100), // current odds different from bet odds
         ];
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -462,9 +459,8 @@ describe('calculateSportsPayoutOdds', () => {
           winProbability: 0.8,
         };
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections: null,
+        const result = calculateSportsPayoutOddsFromLegs(toRegularLegs(selections), marketSelections, {
+          subBetLegs: null,
           isEstimation: false,
         });
 
@@ -485,9 +481,8 @@ describe('calculateSportsPayoutOdds', () => {
 
       const customOdds = new BigNumber(5.5);
 
-      const result = calculateSportsPayoutOdds(selections, marketSelections, {
-        sportsCustomBetTotalOddsDecimal: customOdds,
-        subBetSelections: null,
+      const result = calculateSportsPayoutOddsFromLegs([toCustomLeg(customOdds, selections)], marketSelections, {
+        subBetLegs: null,
         isEstimation: false,
       });
 
@@ -503,9 +498,8 @@ describe('calculateSportsPayoutOdds', () => {
 
       const customOdds = new BigNumber(5.5);
 
-      const result = calculateSportsPayoutOdds(selections, marketSelections, {
-        sportsCustomBetTotalOddsDecimal: customOdds,
-        subBetSelections: null,
+      const result = calculateSportsPayoutOddsFromLegs([toCustomLeg(customOdds, selections)], marketSelections, {
+        subBetLegs: null,
         isEstimation: false,
       });
 
@@ -521,9 +515,8 @@ describe('calculateSportsPayoutOdds', () => {
 
       const customOdds = new BigNumber(5.5);
 
-      const result = calculateSportsPayoutOdds(selections, marketSelections, {
-        sportsCustomBetTotalOddsDecimal: customOdds,
-        subBetSelections: null,
+      const result = calculateSportsPayoutOddsFromLegs([toCustomLeg(customOdds, selections)], marketSelections, {
+        subBetLegs: null,
         isEstimation: false,
       });
 
@@ -539,9 +532,8 @@ describe('calculateSportsPayoutOdds', () => {
 
       const customOdds = new BigNumber(5.5);
 
-      const result = calculateSportsPayoutOdds(selections, marketSelections, {
-        sportsCustomBetTotalOddsDecimal: customOdds,
-        subBetSelections: null,
+      const result = calculateSportsPayoutOddsFromLegs([toCustomLeg(customOdds, selections)], marketSelections, {
+        subBetLegs: null,
         isEstimation: false,
       });
 
@@ -557,9 +549,8 @@ describe('calculateSportsPayoutOdds', () => {
 
       const customOdds = new BigNumber(5.5);
 
-      const result = calculateSportsPayoutOdds(selections, marketSelections, {
-        sportsCustomBetTotalOddsDecimal: customOdds,
-        subBetSelections: null,
+      const result = calculateSportsPayoutOddsFromLegs([toCustomLeg(customOdds, selections)], marketSelections, {
+        subBetLegs: null,
         isEstimation: false,
       });
 
@@ -649,18 +640,18 @@ describe('calculateSportsPayoutOdds', () => {
         createSelection('sel2', SportsBetSelectionStatus.WON, 22, 100),
         createSelection('sel3', SportsBetSelectionStatus.LOST, 25, 100),
       ];
-      const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.DOUBLES);
-      const result = calculateSportsPayoutOdds(
-        selections,
+      const legs = toRegularLegs(selections);
+      const subBetLegs = getSystemBetSubBetLegs(legs, SportsSystemBetType.DOUBLES);
+      const result = calculateSportsPayoutOddsFromLegs(
+        legs,
         [
           createMarketSelection('sel1', 7, 100, 0.934589),
           createMarketSelection('sel2', 22, 100, 0.778984),
           createMarketSelection('sel3', 25, 100, 0.254629),
         ],
         {
-          subBetSelections,
+          subBetLegs,
           isEstimation: false,
-          sportsCustomBetTotalOddsDecimal: null,
         },
       );
 
@@ -680,11 +671,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 200, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.DOUBLES);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.DOUBLES);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -708,11 +699,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 200, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.DOUBLES);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.DOUBLES);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -736,11 +727,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 100, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.TRIXIE);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.TRIXIE);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -763,11 +754,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 150, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.PATENT);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.PATENT);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -795,11 +786,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 150, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.DOUBLES);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.DOUBLES);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -825,11 +816,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel4', 100, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.YANKEE);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.YANKEE);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });
 
@@ -853,11 +844,11 @@ describe('calculateSportsPayoutOdds', () => {
           createMarketSelection('sel3', 200, 100),
         ];
 
-        const subBetSelections = getSystemBetSubBetSelections(selections, SportsSystemBetType.DOUBLES);
+        const selectionsLegs = toRegularLegs(selections);
+        const subBetLegs = getSystemBetSubBetLegs(selectionsLegs, SportsSystemBetType.DOUBLES);
 
-        const result = calculateSportsPayoutOdds(selections, marketSelections, {
-          sportsCustomBetTotalOddsDecimal: null,
-          subBetSelections,
+        const result = calculateSportsPayoutOddsFromLegs(selectionsLegs, marketSelections, {
+          subBetLegs,
           isEstimation: false,
         });