chore: blocks per window (#146)

* chore: pass blocksPerWindow in init * chore: moved blocksPerWindow to init
primev · Jun 21, 2024 · 64bc907 · 64bc907
1 parent 2838db7
commit 64bc907
Show file tree

Hide file tree

Showing 16 changed files with 244 additions and 159 deletions.
diff --git a/contracts-abi/abi/BidderRegistry.abi b/contracts-abi/abi/BidderRegistry.abi
@@ -101,6 +101,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "blocksPerWindow",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "depositForSpecificWindow",
@@ -237,6 +250,11 @@
         "name": "_blockTracker",
         "type": "address",
         "internalType": "address"
+      },
+      {
+        "name": "_blocksPerWindow",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "outputs": [],

diff --git a/contracts-abi/abi/BlockTracker.abi b/contracts-abi/abi/BlockTracker.abi
@@ -158,25 +158,6 @@
     ],
     "stateMutability": "view"
   },
-  {
-    "type": "function",
-    "name": "getWindowFromBlockNumber",
-    "inputs": [
-      {
-        "name": "blockNumber",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "initialize",
@@ -185,6 +166,11 @@
         "name": "_owner",
         "type": "address",
         "internalType": "address"
+      },
+      {
+        "name": "_blocksPerWindow",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "outputs": [],

diff --git a/contracts-abi/abi/PreConfCommitmentStore.abi b/contracts-abi/abi/PreConfCommitmentStore.abi
@@ -109,6 +109,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "blocksPerWindow",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "commitmentDispatchWindow",
@@ -683,6 +696,11 @@
         "name": "_commitmentDispatchWindow",
         "type": "uint64",
         "internalType": "uint64"
+      },
+      {
+        "name": "_blocksPerWindow",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "outputs": [],

diff --git a/contracts-abi/clients/BidderRegistry/BidderRegistry.go b/contracts-abi/clients/BidderRegistry/BidderRegistry.go
diff --git a/contracts-abi/clients/BlockTracker/BlockTracker.go b/contracts-abi/clients/BlockTracker/BlockTracker.go
diff --git a/contracts-abi/clients/PreConfCommitmentStore/PreConfCommitmentStore.go b/contracts-abi/clients/PreConfCommitmentStore/PreConfCommitmentStore.go
diff --git a/contracts/contracts/BidderRegistry.sol b/contracts/contracts/BidderRegistry.sol
@@ -6,6 +6,7 @@ import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/ut
 
 import {IBidderRegistry} from "./interfaces/IBidderRegistry.sol";
 import {IBlockTracker} from "./interfaces/IBlockTracker.sol";
+import {WindowFromBlockNumber} from "./utils/WindowFromBlockNumber.sol";
 
 /// @title Bidder Registry
 /// @author Kartik Chopra
@@ -58,6 +59,9 @@ contract BidderRegistry is
     /// @dev Amount assigned to bidders
     mapping(address => uint256) public providerAmount;
 
+    /// @dev Amount assigned to bidders
+    uint256 public blocksPerWindow;
+
     /// @dev Event emitted when a bidder is registered with their deposited amount
     event BidderRegistered(
         address indexed bidder,
@@ -116,12 +120,14 @@ contract BidderRegistry is
         address _feeRecipient,
         uint16 _feePercent,
         address _owner,
-        address _blockTracker
+        address _blockTracker,
+        uint256 _blocksPerWindow
     ) external initializer {
         minDeposit = _minDeposit;
         feeRecipient = _feeRecipient;
         feePercent = _feePercent;
         blockTrackerContract = IBlockTracker(_blockTracker);
+        blocksPerWindow = _blocksPerWindow;
         __Ownable_init(_owner);
     }
 
@@ -187,8 +193,7 @@ contract BidderRegistry is
         lockedFunds[msg.sender][window] = newLockedFunds;
 
         // Calculate the maximum bid per block for the given window
-        uint256 numberOfRounds = blockTrackerContract.getBlocksPerWindow();
-        maxBidPerBlock[msg.sender][window] = newLockedFunds / numberOfRounds;
+        maxBidPerBlock[msg.sender][window] = newLockedFunds / blocksPerWindow;
 
         emit BidderRegistered(msg.sender, newLockedFunds, window);
     }
@@ -295,8 +300,9 @@ contract BidderRegistry is
         if (bidState.state != State.Undefined) {
             return;
         }
-        uint256 currentWindow = blockTrackerContract.getWindowFromBlockNumber(
-            blockNumber
+        uint256 currentWindow = WindowFromBlockNumber.getWindowFromBlockNumber(
+            blockNumber,
+            blocksPerWindow
         );
 
         uint256 windowAmount = maxBidPerBlock[bidder][currentWindow];

diff --git a/contracts/contracts/BlockTracker.sol b/contracts/contracts/BlockTracker.sol
@@ -34,9 +34,9 @@ contract BlockTracker is OwnableUpgradeable {
      * @dev Initializes the BlockTracker contract with the specified owner.
      * @param _owner The address of the contract owner.
      */
-    function initialize(address _owner) external initializer {
+    function initialize(address _owner, uint256 _blocksPerWindow) external initializer {
         currentWindow = 1;
-        blocksPerWindow = 10;
+        blocksPerWindow = _blocksPerWindow;
         __Ownable_init(_owner);
     }
 
@@ -76,15 +76,6 @@ contract BlockTracker is OwnableUpgradeable {
         return blockBuilderNameToAddress[builderNameGrafiti];
     }
 
-    /**
-     * @dev Returns the window number corresponding to a given block number.
-     * @param blockNumber The block number.
-     * @return The window number.
-     */
-    function getWindowFromBlockNumber(uint256 blockNumber) external view returns (uint256) {
-        return (blockNumber - 1) / blocksPerWindow + 1;
-    }
-
     /**
      * @dev Returns the number of blocks per window.
      * @return The number of blocks per window.