fix: added requestsHash to rpl block encoding (#100)

* fix: added requestsHash to rpl block encoding

* fix: updated comment

* fix: fixed types

Author: sendra

src/utils/ether-v5/proofsHelpers.ts

@@ -12,9 +12,10 @@ export function formatToProofRLP(rawData: string[]): string {
   );
 }
 
-// IMPORTANT valid only for post-Dancun blocks:
+// IMPORTANT valid only for post-Pectra blocks:
 // https://eips.ethereum.org/EIPS/eip-4844#header-extension
 // https://eips.ethereum.org/EIPS/eip-4788#block-structure-and-validity
+// https://cantina.xyz/introduction/pectra-competition-resources/eip-7685
 export function prepareBLockRLP(rawBlock: any) {
   const rawData = [
     rawBlock.parentHash,
@@ -43,6 +44,7 @@ export function prepareBLockRLP(rawBlock: any) {
       ? '0x'
       : BigNumber.from(rawBlock.excessBlobGas).toHexString(),
     rawBlock.parentBeaconBlockRoot,
+    rawBlock.requestsHash,
   ];
   return ethers.utils.RLP.encode(rawData);
 }

src/utils/viem/proofsHelpers.ts

@@ -24,11 +24,15 @@ export const formatToProofRLP = (rawData: Hex[]) => {
   return toRlp(rawData.map((d: Hex) => fromRlp(d, 'hex')));
 };
 
-// IMPORTANT valid only for post-Dancun blocks:
+// IMPORTANT valid only for post-Pectra blocks:
 // https://eips.ethereum.org/EIPS/eip-4844#header-extension
 // https://eips.ethereum.org/EIPS/eip-4788#block-structure-and-validity
+// https://cantina.xyz/introduction/pectra-competition-resources/eip-7685
 export const prepareBLockRLP = (
-  rawBlock: Block & { parentBeaconBlockRoot: Hex },
+  rawBlock: Block & {
+    parentBeaconBlockRoot: Hex;
+    requestsHash: Hex;
+  },
 ) => {
   const rawData: Hex[] = [
     rawBlock.parentHash,
@@ -53,6 +57,7 @@ export const prepareBLockRLP = (
     // @ts-ignore
     rawBlock.excessBlobGas === '0x0' ? '0x' : toHex(rawBlock.excessBlobGas),
     rawBlock.parentBeaconBlockRoot,
+    rawBlock.requestsHash,
   ];
   return toRlp(rawData);
 };