Updates.

Author: br0wnD3v

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "git.ignoreLimitWarning": true
+}

graphql/README.md README.md

@@ -24,9 +24,13 @@ struct Prediction {
 interface ITrading {
     function concludePrediction_2(uint256, bool) external;
 
+    function getNextPredictionId() external view returns (uint256);
+
     function getPrediction(uint256) external view returns (Prediction memory);
 }
 
+error PM_InvalidPredictionId();
+
 /// @dev The contract is inherently a data feed reader
 contract PM_Settlement is Ownable {
     /// @notice The Trading contract that acts as a middle ground for Settlement and MarketHandler
@@ -37,12 +41,20 @@ contract PM_Settlement is Ownable {
         tradingContract = ITrading(_trading);
     }
 
+    modifier isValidPredictionId(uint256 _id) {
+        uint256 currentUpper = tradingContract.getNextPredictionId();
+        if (_id >= currentUpper) revert PM_InvalidPredictionId();
+        _;
+    }
+
     /// @dev We can add an incentive to whoever calls it get some % of overall protocol fee for a given prediction.
     /// Note that this should come out > gas fee to run the txn in the first place. Or we use CRON job, EAC,
     /// Cloud-based scheduler.
     /// @dev Personally think that the 1st and 3rd options are good candidates.
     /// @param _predictionId The unique identifier for the prediction to be concluded.
-    function concludePrediction_1(uint256 _predictionId) external {
+    function concludePrediction_1(
+        uint256 _predictionId
+    ) external isValidPredictionId(_predictionId) {
         Prediction memory associatedPrediction = tradingContract.getPrediction(
             _predictionId
         );

backend/contracts/common/Settlement.sol

@@ -83,6 +83,8 @@ contract PredictionMarket is Context, Ownable {
         int256 amountNo
     );
 
+    event PredictionConcluded(uint256 indexed predictionId, uint256 timestamp);
+
     /// @notice The payment token interface
     IERC20 immutable I_USDC_CONTRACT;
 
@@ -207,6 +209,8 @@ contract PredictionMarket is Context, Ownable {
         IMarketHandler mhInstance = IMarketHandler(associatedMHAddress);
 
         mhInstance.concludePrediction_3(_vote);
+
+        emit PredictionConcluded(_predictionId, block.timestamp);
     }
 
     /// @notice Setter functions ------
@@ -223,6 +227,11 @@ contract PredictionMarket is Context, Ownable {
     }
 
     /// @notice Getter functions ------
+
+    function getNextPredictionId() external view returns (uint256) {
+        return nextPredictionId.current();
+    }
+
     function getPrediction(
         uint256 _predictionId
     ) external view returns (Prediction memory) {

backend/contracts/common/Trading.sol

@@ -15,18 +15,9 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
   });
 
   /// THESE ARE ALL ON POLYGON TESTNET
-  const assetArray = ["AAVE", "API3", "BTC", "ETH", "MATIC"];
-  const proxyArray = [
-    "0x13d1Ed8c24911d88e6155cE32A66908399C97924",
-    "0xf25b7429406b24da879f0d1a008596b74fcb9c2f",
-    "0xe5Cf15fED24942E656dBF75165aF1851C89F21B5",
-    "0x26690F9f17FdC26D419371315bc17950a0FC90eD",
-    "0x3ACccB328Db79Af1B81a4801DAf9ac8370b9FBF8",
-  ];
-  const limit = 5;
   const Trading = await deploy("PredictionMarket", {
     from: deployer,
-    args: [Mock.address, assetArray, proxyArray, limit],
+    args: [Mock.address],
   });
 
   const Settlement = await deploy("PM_Settlement", {

backend/deploy/0_deploy.js

@@ -0,0 +1 @@
+5