Merge pull request #11 from halo3mic/dencun_update

Dencun update
halo3mic · Feb 25, 2024 · b69ab63 · b69ab63
2 parents 6eee5b2 + 5a4ac3a
commit b69ab63
Show file tree

Hide file tree

Showing 12 changed files with 172 additions and 16 deletions.
diff --git a/abi/contracts/blockad/BlockAdV1.sol/BlockAdAuctionV1.json b/abi/contracts/blockad/BlockAdV1.sol/BlockAdAuctionV1.json
@@ -175,6 +175,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",

diff --git a/abi/contracts/blockad/BlockAdV2.sol/BlockAdAuctionV2.json b/abi/contracts/blockad/BlockAdV2.sol/BlockAdAuctionV2.json
@@ -212,6 +212,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",

diff --git a/abi/contracts/blockad/lib/Builder.sol/Builder.json b/abi/contracts/blockad/lib/Builder.sol/Builder.json
@@ -181,6 +181,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -313,6 +318,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -411,6 +421,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -509,6 +524,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",

diff --git a/abi/contracts/standard_peekers/bids.sol/EthBlockBidSenderContract.json b/abi/contracts/standard_peekers/bids.sol/EthBlockBidSenderContract.json
@@ -141,6 +141,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -249,6 +254,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -347,6 +357,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -445,6 +460,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",

diff --git a/abi/contracts/standard_peekers/bids.sol/EthBlockContract.json b/abi/contracts/standard_peekers/bids.sol/EthBlockContract.json
@@ -130,6 +130,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -238,6 +243,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -336,6 +346,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",
@@ -434,6 +449,11 @@
             "name": "extra",
             "type": "bytes"
           },
+          {
+            "internalType": "bytes32",
+            "name": "parentBeaconBlockRoot",
+            "type": "bytes32"
+          },
           {
             "internalType": "bool",
             "name": "fillPending",

diff --git a/abi/solady/src/utils/JSONParserLib.sol/JSONParserLib.json b/abi/solady/src/utils/JSONParserLib.sol/JSONParserLib.json
@@ -0,0 +1,7 @@
+[
+  {
+    "inputs": [],
+    "name": "ParsingFailed",
+    "type": "error"
+  }
+]
diff --git a/abi/solady/src/utils/LibString.sol/LibString.json b/abi/solady/src/utils/LibString.sol/LibString.json
@@ -0,0 +1,12 @@
+[
+  {
+    "inputs": [],
+    "name": "HexLengthInsufficient",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "TooBigForSmallString",
+    "type": "error"
+  }
+]
diff --git a/contracts/libraries/Suave.sol b/contracts/libraries/Suave.sol
@@ -16,6 +16,7 @@ library Suave {
         bytes32 random;
         Withdrawal[] withdrawals;
         bytes extra;
+        bytes32 parentBeaconBlockRoot;
         bool fillPending;
     }
 

diff --git a/deployments/rigil/BlockAdAuctionV2.json b/deployments/rigil/BlockAdAuctionV2.json
diff --git a/deployments/rigil/solcInputs/2c77e4990a5e02143cdaa02b8820ef1d.json b/deployments/rigil/solcInputs/2c77e4990a5e02143cdaa02b8820ef1d.json
diff --git a/tasks/build-blocks.ts b/tasks/build-blocks.ts
@@ -160,7 +160,7 @@ function makeCalldata(
 	iface?: ethers.utils.Interface, 
 	method?: string
 ) {
-	const fillPending = true
+	const fillPending = false
 	const blockArgs = [
 		bbArgs.slot,
 		bbArgs.proposerPubkey,
@@ -171,6 +171,7 @@ function makeCalldata(
 		bbArgs.random,
 		bbArgs.withdrawals.map(w => [ w.index, w.validator, w.address, w.amount ]),
 		ethers.constants.HashZero,
+		bbArgs.parentBeaconBlockRoot,
 		fillPending,
 	]
 	if (!method)
@@ -190,6 +191,7 @@ export interface BuildBlockArgs {
 	gasLimit: number;
 	random: string;
 	withdrawals: Withdrawal[];
+	parentBeaconBlockRoot: string;
 }
 
 interface Withdrawal {
@@ -217,6 +219,7 @@ export function makeBuildBlockArgs(beacon: BeaconEventData, validator: Validator
 		feeRecipient: validator.feeRecipient,
 		gasLimit: validator.gasLimit,
 		proposerPubkey: validator.pubkey,
+		parentBeaconBlockRoot: beacon.payload_attributes.parent_beacon_block_root,
 	}
 
 }
@@ -229,7 +232,7 @@ export interface ITaskConfig {
 	relayUrl: string,
 	beaconUrl: string,
 	buildOpts?: IBuildOptions,
-	resubmit: boolean,
+	resubmit?: boolean,
 }
 
 async function getConfig(hre: HRE, taskArgs: any): Promise<ITaskConfig> {

diff --git a/tasks/utils/beacon.ts b/tasks/utils/beacon.ts
@@ -14,6 +14,7 @@ export interface PayloadAttributes {
 	prev_randao: string;
 	suggested_fee_recipient: string;
 	withdrawals: Withdrawal[];
+	parent_beacon_block_root: string;
 }
 
 export interface BeaconEventData {
@@ -95,7 +96,8 @@ export class BeaconPAListener {
 						validator_index: Number(w.validator_index),
 						address: w.address,
 						amount: Number(w.amount)
-					}))
+					})),
+					parent_beacon_block_root: parsed.data.payload_attributes.parent_beacon_block_root
 				}
 			}
 		}