Merge pull request #290 from thales-markets/normalized_odds_change

refactor obtainer to use normalized odds from storage also resize contract
thales-markets · Mar 3, 2023 · 557fee4 · 557fee4
2 parents 1525b54 + 8433e4c
commit 557fee4
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 122 deletions.
diff --git a/contracts/SportMarkets/Rundown/GamesOddsObtainer.sol b/contracts/SportMarkets/Rundown/GamesOddsObtainer.sol
diff --git a/contracts/SportMarkets/Rundown/TherundownConsumer.sol b/contracts/SportMarkets/Rundown/TherundownConsumer.sol
@@ -485,6 +485,8 @@ contract TherundownConsumer is Initializable, ProxyOwned, ProxyPausable {
             marketCreated[address(market)] = true;
             canMarketBeUpdated[address(market)] = true;
 
+            oddsObtainer.setFirstNormalizedOdds(game.gameId, address(market));
+
             queues.dequeueGamesCreated();
 
             emit CreateSportsMarket(address(market), game.gameId, game, tags, oddsObtainer.getNormalizedOdds(game.gameId));

diff --git a/contracts/interfaces/IGamesOddsObtainer.sol b/contracts/interfaces/IGamesOddsObtainer.sol
@@ -84,6 +84,8 @@ interface IGamesOddsObtainer {
         int24 _drawOdds
     ) external;
 
+    function setFirstNormalizedOdds(bytes32 _gameId, address _market) external;
+
     function setBackupOddsAsMainOddsForGame(bytes32 _gameId) external;
 
     function pauseUnpauseChildMarkets(address _main, bool _flag) external;

diff --git a/scripts/abi/GamesOddsObtainer.json b/scripts/abi/GamesOddsObtainer.json
@@ -1009,6 +1009,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_market",
+        "type": "address"
+      }
+    ],
+    "name": "getNormalizedChildOddsFromGameOddsStruct",
+    "outputs": [
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1047,6 +1066,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "_gameId",
+        "type": "bytes32"
+      }
+    ],
+    "name": "getNormalizedOddsFromGameOddsStruct",
+    "outputs": [
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1278,6 +1316,49 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "normalizedOddsForMarket",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "normalizedOddsForMarketFulfilled",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1527,6 +1608,24 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "_gameId",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "address",
+        "name": "_market",
+        "type": "address"
+      }
+    ],
+    "name": "setFirstNormalizedOdds",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/scripts/abi/IGamesOddsObtainer.json b/scripts/abi/IGamesOddsObtainer.json
@@ -511,6 +511,24 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "_gameId",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "address",
+        "name": "_market",
+        "type": "address"
+      }
+    ],
+    "name": "setFirstNormalizedOdds",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/test/contracts/SportMarkets/TherundownConsumer.js b/test/contracts/SportMarkets/TherundownConsumer.js
@@ -2536,6 +2536,11 @@ contract('TheRundownConsumer', (accounts) => {
 
 			let marketAdd = await TherundownConsumerDeployed.marketPerGameId(gameFootballid1);
 
+			let normalizedFulfiled = await GamesOddsObtainerDeployed.normalizedOddsForMarketFulfilled(
+				marketAdd
+			);
+			assert.equal(true, normalizedFulfiled);
+
 			// check if event is emited
 			assert.eventEqual(tx_create.logs[tx_create.logs.length - 1], 'CreateSportsMarket', {
 				_marketAddress: marketAdd,
@@ -2558,6 +2563,18 @@ contract('TheRundownConsumer', (accounts) => {
 				}
 			);
 
+			normalizedFulfiled = await GamesOddsObtainerDeployed.normalizedOddsForMarketFulfilled(
+				marketAdd
+			);
+			assert.equal(true, normalizedFulfiled);
+
+			let normalizedFirst = await GamesOddsObtainerDeployed.normalizedOddsForMarket(marketAdd, 0);
+			assert.bnNotEqual(0, normalizedFirst);
+			let normalizedSecond = await GamesOddsObtainerDeployed.normalizedOddsForMarket(marketAdd, 1);
+			assert.bnNotEqual(0, normalizedSecond);
+			let normalizedThird = await GamesOddsObtainerDeployed.normalizedOddsForMarket(marketAdd, 2);
+			assert.bnNotEqual(0, normalizedThird);
+
 			let result_final = await GamesOddsObtainerDeployed.getOddsForGame(gameFootballid1);
 			assert.bnEqual(40000, result_final[0]);
 			assert.bnEqual(-12500, result_final[1]);
@@ -3463,6 +3480,22 @@ contract('TheRundownConsumer', (accounts) => {
 				await GamesOddsObtainerDeployed.currentActiveSpreadChildMarket(marketAdd)
 			);
 
+			let normalizedFulfiled = await GamesOddsObtainerDeployed.normalizedOddsForMarketFulfilled(
+				mainMarketSpreadChildMarket
+			);
+			assert.equal(true, normalizedFulfiled);
+
+			let normalizedFirst = await GamesOddsObtainerDeployed.normalizedOddsForMarket(
+				mainMarketSpreadChildMarket,
+				0
+			);
+			assert.bnNotEqual(0, normalizedFirst);
+			let normalizedSecond = await GamesOddsObtainerDeployed.normalizedOddsForMarket(
+				mainMarketSpreadChildMarket,
+				1
+			);
+			assert.bnNotEqual(0, normalizedSecond);
+
 			let childMarket = await SportPositionalMarketContract.at(mainMarketSpreadChildMarket);
 
 			assert.equal(false, await childMarket.canResolve());