Merge pull request #10 from halo3mic/catchup_jan01

catchup with fb changes - use mempool to build blocks
halo3mic · Jan 12, 2024 · 6eee5b2 · 6eee5b2
2 parents 72a7fd9 + 42ed194
commit 6eee5b2
Show file tree

Hide file tree

Showing 10 changed files with 223 additions and 33 deletions.
diff --git a/abi/contracts/blockad/BlockAdV1.sol/BlockAdAuctionV1.json b/abi/contracts/blockad/BlockAdV1.sol/BlockAdAuctionV1.json
@@ -174,6 +174,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",

diff --git a/abi/contracts/blockad/BlockAdV2.sol/BlockAdAuctionV2.json b/abi/contracts/blockad/BlockAdV2.sol/BlockAdAuctionV2.json
@@ -211,6 +211,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",

diff --git a/abi/contracts/blockad/lib/Builder.sol/Builder.json b/abi/contracts/blockad/lib/Builder.sol/Builder.json
@@ -180,6 +180,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -307,6 +312,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -400,6 +410,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -493,6 +508,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",

diff --git a/abi/contracts/standard_peekers/bids.sol/EthBlockBidSenderContract.json b/abi/contracts/standard_peekers/bids.sol/EthBlockBidSenderContract.json
@@ -140,6 +140,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -243,6 +248,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -336,6 +346,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -429,6 +444,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",

diff --git a/abi/contracts/standard_peekers/bids.sol/EthBlockContract.json b/abi/contracts/standard_peekers/bids.sol/EthBlockContract.json
@@ -129,6 +129,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -232,6 +237,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -325,6 +335,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",
@@ -418,6 +433,11 @@
             "internalType": "bytes",
             "name": "extra",
             "type": "bytes"
+          },
+          {
+            "internalType": "bool",
+            "name": "fillPending",
+            "type": "bool"
           }
         ],
         "internalType": "struct Suave.BuildBlockArgs",

diff --git a/contracts/libraries/Suave.sol b/contracts/libraries/Suave.sol
@@ -16,6 +16,7 @@ library Suave {
         bytes32 random;
         Withdrawal[] withdrawals;
         bytes extra;
+        bool fillPending;
     }
 
     struct DataRecord {

diff --git a/deployments/rigil/BlockAdAuctionV2.json b/deployments/rigil/BlockAdAuctionV2.json
diff --git a/deployments/rigil/solcInputs/3f2cfcf165740f55302d083efbeaea10.json b/deployments/rigil/solcInputs/3f2cfcf165740f55302d083efbeaea10.json
diff --git a/deployments/rigil/solcInputs/7f031fc6e7dc25271d64b2857e669634.json b/deployments/rigil/solcInputs/7f031fc6e7dc25271d64b2857e669634.json
diff --git a/tasks/build-blocks.ts b/tasks/build-blocks.ts
@@ -160,6 +160,7 @@ function makeCalldata(
 	iface?: ethers.utils.Interface, 
 	method?: string
 ) {
+	const fillPending = true
 	const blockArgs = [
 		bbArgs.slot,
 		bbArgs.proposerPubkey,
@@ -169,7 +170,8 @@ function makeCalldata(
 		bbArgs.gasLimit,
 		bbArgs.random,
 		bbArgs.withdrawals.map(w => [ w.index, w.validator, w.address, w.amount ]),
-		ethers.constants.HashZero
+		ethers.constants.HashZero,
+		fillPending,
 	]
 	if (!method)
 		method = 'buildMevShare'