Squashed commit of the following:

commit 946c209 Author: Shawn <[email protected]> Date: Fri Jul 19 18:47:56 2024 -0700 chore: update abis + bindings commit 6e74e2b Author: Shawn <[email protected]> Date: Fri Jul 19 18:43:35 2024 -0700 fix: smaller require msges commit 5f206ec Author: Shawn <[email protected]> Date: Fri Jul 19 18:16:26 2024 -0700 chore: go back to require statements due to ethereum/go-ethereum#26823 commit a6a076e Author: Mikhail Wall <[email protected]> Date: Sat Jul 20 00:57:26 2024 +0200 feat: Fully enable solhint merge (#258) * fix: fixed bidder registry linter * fix: fixed blockTracker * fix: fixing oracle and fixed interfaces * fix: merged with Shawn branch * fix: added more custom errors commit 0bc368c Author: Shawn <[email protected]> Date: Fri Jul 19 14:56:58 2024 -0700 fix: missed a disable line commit 0b1f929 Author: Shawn <[email protected]> Date: Fri Jul 19 14:55:29 2024 -0700 refactor: address unused imports point commit 3327469 Author: Shawn <[email protected]> Date: Fri Jul 19 14:54:36 2024 -0700 refactor: correct style related points commit ce642d8 Author: Shawn <[email protected]> Date: Fri Jul 19 14:25:35 2024 -0700 fix: proper use of solhint disable for empty blocks check commit 9971497 Author: Shawn <[email protected]> Date: Fri Jul 19 14:12:04 2024 -0700 refactor: correct all instances of gas-length-in-loops infractions commit 33f603d Author: Shawn <[email protected]> Date: Fri Jul 19 14:02:14 2024 -0700 refactor: correct all instances of private-vars-leading-underscore infractions commit ba33b03 Author: Shawn <[email protected]> Date: Fri Jul 19 13:28:24 2024 -0700 refactor: refactor contracts for all instances of ordering infractions Co-Authored-By: Mikhail Wall <[email protected]>
primev · Jul 20, 2024 · c8e1ecd · c8e1ecd
1 parent b394bd8
commit c8e1ecd
Show file tree

Hide file tree

Showing 30 changed files with 1,178 additions and 1,023 deletions.
diff --git a/contracts-abi/abi/BidderRegistry.abi b/contracts-abi/abi/BidderRegistry.abi
@@ -14,60 +14,29 @@
   },
   {
     "type": "function",
-    "name": "BidPayment",
-    "inputs": [
-      {
-        "name": "",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      }
-    ],
+    "name": "PERCENT",
+    "inputs": [],
     "outputs": [
       {
-        "name": "bidder",
-        "type": "address",
-        "internalType": "address"
-      },
-      {
-        "name": "bidAmt",
+        "name": "",
         "type": "uint256",
         "internalType": "uint256"
-      },
-      {
-        "name": "state",
-        "type": "uint8",
-        "internalType": "enum IBidderRegistry.State"
       }
     ],
     "stateMutability": "view"
   },
   {
     "type": "function",
-    "name": "OpenBid",
-    "inputs": [
-      {
-        "name": "commitmentDigest",
-        "type": "bytes32",
-        "internalType": "bytes32"
-      },
+    "name": "PRECISION",
+    "inputs": [],
+    "outputs": [
       {
-        "name": "bid",
+        "name": "",
         "type": "uint256",
         "internalType": "uint256"
-      },
-      {
-        "name": "bidder",
-        "type": "address",
-        "internalType": "address"
-      },
-      {
-        "name": "blockNumber",
-        "type": "uint64",
-        "internalType": "uint64"
       }
     ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
+    "stateMutability": "view"
   },
   {
     "type": "function",
@@ -89,6 +58,35 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "bidPayment",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "bidder",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "bidAmt",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "state",
+        "type": "uint8",
+        "internalType": "enum IBidderRegistry.State"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "bidderRegistered",
@@ -336,6 +334,34 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "openBid",
+    "inputs": [
+      {
+        "name": "commitmentDigest",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "bid",
+        "type": "uint256",
+        "internalType": "uint256"
+      },
+      {
+        "name": "bidder",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "blockNumber",
+        "type": "uint64",
+        "internalType": "uint64"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
   {
     "type": "function",
     "name": "owner",
@@ -610,7 +636,7 @@
     "name": "withdrawProtocolFee",
     "inputs": [
       {
-        "name": "bidder",
+        "name": "treasuryAddress",
         "type": "address",
         "internalType": "address payable"
       }
@@ -644,13 +670,13 @@
       {
         "name": "depositedAmount",
         "type": "uint256",
-        "indexed": false,
+        "indexed": true,
         "internalType": "uint256"
       },
       {
         "name": "windowNumber",
         "type": "uint256",
-        "indexed": false,
+        "indexed": true,
         "internalType": "uint256"
       }
     ],
@@ -669,13 +695,13 @@
       {
         "name": "window",
         "type": "uint256",
-        "indexed": false,
+        "indexed": true,
         "internalType": "uint256"
       },
       {
         "name": "amount",
         "type": "uint256",
-        "indexed": false,
+        "indexed": true,
         "internalType": "uint256"
       }
     ],
@@ -700,7 +726,7 @@
       {
         "name": "window",
         "type": "uint256",
-        "indexed": false,
+        "indexed": true,
         "internalType": "uint256"
       },
       {

diff --git a/contracts-abi/abi/PreConfCommitmentStore.abi b/contracts-abi/abi/PreConfCommitmentStore.abi
@@ -66,35 +66,29 @@
   },
   {
     "type": "function",
-    "name": "UPGRADE_INTERFACE_VERSION",
+    "name": "HEXCHARS",
     "inputs": [],
     "outputs": [
       {
         "name": "",
-        "type": "string",
-        "internalType": "string"
+        "type": "bytes",
+        "internalType": "bytes"
       }
     ],
     "stateMutability": "view"
   },
   {
     "type": "function",
-    "name": "_bytesToHexString",
-    "inputs": [
-      {
-        "name": "_bytes",
-        "type": "bytes",
-        "internalType": "bytes"
-      }
-    ],
+    "name": "UPGRADE_INTERFACE_VERSION",
+    "inputs": [],
     "outputs": [
       {
         "name": "",
         "type": "string",
         "internalType": "string"
       }
     ],
-    "stateMutability": "pure"
+    "stateMutability": "view"
   },
   {
     "type": "function",

diff --git a/contracts-abi/abi/ProviderRegistry.abi b/contracts-abi/abi/ProviderRegistry.abi
@@ -12,25 +12,6 @@
     "type": "receive",
     "stateMutability": "payable"
   },
-  {
-    "type": "function",
-    "name": "EOAToBLSPubkey",
-    "inputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bytes",
-        "internalType": "bytes"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "PERCENT",
@@ -122,6 +103,25 @@
     "outputs": [],
     "stateMutability": "payable"
   },
+  {
+    "type": "function",
+    "name": "eoaToBlsPubkey",
+    "inputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "feePercent",

diff --git a/contracts-abi/clients/BidderRegistry/BidderRegistry.go b/contracts-abi/clients/BidderRegistry/BidderRegistry.go
diff --git a/contracts-abi/clients/PreConfCommitmentStore/PreConfCommitmentStore.go b/contracts-abi/clients/PreConfCommitmentStore/PreConfCommitmentStore.go
diff --git a/contracts-abi/clients/ProviderRegistry/ProviderRegistry.go b/contracts-abi/clients/ProviderRegistry/ProviderRegistry.go
diff --git a/contracts/.solhint.json b/contracts/.solhint.json
@@ -9,13 +9,21 @@
     "gas-increment-by-one": "error",
     "gas-struct-packing": "error",
     "no-unused-vars": "error",
+    "no-unused-import": "error",
     "interface-starts-with-i": "error",
-    "reason-string": "warn",
-    "private-vars-leading-underscore": "warn",
-    "gas-length-in-loops": "warn",
-    "gas-strict-inequalities": "warn",
-    "ordering": "warn",
-    "gas-indexed-events": "warn",
-    "gas-custom-errors": "warn"
+    "ordering": "error",
+    "private-vars-leading-underscore": "error",
+    "gas-length-in-loops": "error",
+    "const-name-snakecase": "error",
+    "contract-name-camelcase": "error",
+    "event-name-camelcase": "error",
+    "func-name-mixedcase": "error",
+    "immutable-vars-naming": "error",
+    "use-forbidden-name": "error",
+    "var-name-mixedcase": "error",
+    "imports-on-top": "error",
+    "visibility-modifier-order": "error",
+    "reason-string": "error",
+    "gas-custom-errors": "off"
   }
 }