feat: added support for the chainlink rng in the keeper bot

Author: jaybuidl

contracts/scripts/keeperBot.ts

@@ -7,6 +7,7 @@ import {
   KlerosCoreNeo,
   SortitionModuleNeo,
   DisputeKitClassic,
+  ChainlinkRNG,
 } from "../typechain-types";
 import request from "graphql-request";
 import env from "./utils/env";
@@ -61,10 +62,11 @@ const getContracts = async () => {
     default:
       throw new Error("Invalid core type, must be one of base, neo");
   }
+  const chainlinkRng = await ethers.getContractOrNull<ChainlinkRNG>("ChainlinkRNG");
   const randomizerRng = await ethers.getContractOrNull<RandomizerRNG>("RandomizerRNG");
   const blockHashRNG = await ethers.getContractOrNull<BlockHashRNG>("BlockHashRNG");
   const pnk = (await ethers.getContract("PNK")) as PNK;
-  return { core, sortition, randomizerRng, blockHashRNG, disputeKitClassic, pnk };
+  return { core, sortition, chainlinkRng, randomizerRng, blockHashRNG, disputeKitClassic, pnk };
 };
 
 type Contribution = {
@@ -181,11 +183,21 @@ const handleError = (e: any) => {
 };
 
 const isRngReady = async () => {
-  const { randomizerRng, blockHashRNG, sortition } = await getContracts();
+  const { chainlinkRng, randomizerRng, blockHashRNG, sortition } = await getContracts();
   const currentRng = await sortition.rng();
-  if (currentRng === randomizerRng?.target) {
-    const requesterID = await randomizerRng.requesterToID(sortition.target);
-    const n = await randomizerRng.randomNumbers(requesterID);
+  if (currentRng === chainlinkRng?.target) {
+    const requestID = await chainlinkRng.lastRequestId();
+    const n = await chainlinkRng.randomNumbers(requestID);
+    if (Number(n) === 0) {
+      logger.info("ChainlinkRNG is NOT ready yet");
+      return false;
+    } else {
+      logger.info(`ChainlinkRNG is ready: ${n.toString()}`);
+      return true;
+    }
+  } else if (currentRng === randomizerRng?.target) {
+    const requestID = await randomizerRng.lastRequestId();
+    const n = await randomizerRng.randomNumbers(requestID);
     if (Number(n) === 0) {
       logger.info("RandomizerRNG is NOT ready yet");
       return false;

contracts/src/rng/RandomizerRNG.sol

@@ -16,7 +16,7 @@ contract RandomizerRNG is RNG {
     address public sortitionModule; // The address of the SortitionModule.
     IRandomizer public randomizer; // Randomizer address.
     uint256 public callbackGasLimit; // Gas limit for the Randomizer.ai callback.
-    uint256 lastRequestId; // The last request ID.
+    uint256 public lastRequestId; // The last request ID.
     mapping(uint256 requestId => uint256 number) public randomNumbers; // randomNumbers[requestID] is the random number for this request id, 0 otherwise.
 
     // ************************************* //