From 893caeedf27b8abb5dedd10565b955e13042bc05 Mon Sep 17 00:00:00 2001
From: SiddyJ <kachapah@gmail.com>
Date: Sun, 7 Jan 2024 18:37:57 +0530
Subject: [PATCH] initial commit, added new proofs, modified withdrawal params

---
 data/.DS_Store      | Bin 6148 -> 6148 bytes
 proofs.go           |  31 ++++---------------------------
 prove_withdrawal.go |  10 ++++++++++
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/data/.DS_Store b/data/.DS_Store
index 9d60c2f90ef0e445fbbe0123025fe8f6a6f73928..4ffe9846d4e0b5cb392c08cbd569abc35b9d46d4 100644
GIT binary patch
delta 25
fcmZoMXffE}#Wwj9oBHNLHcdt#Lv{0hc2@xadA$hj

delta 23
ccmZoMXffE}#m2<Iu-S*rj}b)AVb2f%07zp6j{pDw

diff --git a/proofs.go b/proofs.go
index f4633c7a..e0e7f494 100644
--- a/proofs.go
+++ b/proofs.go
@@ -462,33 +462,10 @@ func ProveExecutionPayloadAgainstBlockBody(beaconBlockBody *capella.BeaconBlockB
 // refer to this: https://github.com/attestantio/go-eth2-client/blob/654ac05b4c534d96562329f988655e49e5743ff5/spec/phase0/beaconblockheader_encoding.go
 func ProveStateRootAgainstBlockHeader(b *phase0.BeaconBlockHeader) (Proof, error) {
 
-	beaconBlockHeaderContainerRoots := make([]phase0.Root, 5)
-	hh := ssz.NewHasher()
-
-	// Field (0) 'Slot'
-	hh.PutUint64(uint64(b.Slot))
-	copy(beaconBlockHeaderContainerRoots[0][:], hh.Hash())
-	hh.Reset()
-
-	// Field (1) 'ProposerIndex'
-	hh.PutUint64(uint64(b.ProposerIndex))
-	copy(beaconBlockHeaderContainerRoots[1][:], hh.Hash())
-	hh.Reset()
-
-	// Field (2) 'ParentRoot'
-	hh.PutBytes(b.ParentRoot[:])
-	copy(beaconBlockHeaderContainerRoots[2][:], hh.Hash())
-	hh.Reset()
-
-	// Field (3) 'StateRoot'
-	hh.PutBytes(b.StateRoot[:])
-	copy(beaconBlockHeaderContainerRoots[3][:], hh.Hash())
-	hh.Reset()
-
-	// Field (4) 'BodyRoot'
-	hh.PutBytes(b.BodyRoot[:])
-	copy(beaconBlockHeaderContainerRoots[4][:], hh.Hash())
-	hh.Reset()
+	beaconBlockHeaderContainerRoots, err := GetBlockHeaderFieldRoots(b)
+	if err != nil {
+		return nil, err
+	}
 
 	return GetProof(beaconBlockHeaderContainerRoots, stateRootIndex, blockHeaderMerkleSubtreeNumLayers)
 }
diff --git a/prove_withdrawal.go b/prove_withdrawal.go
index 2f8d3773..0ecb561e 100644
--- a/prove_withdrawal.go
+++ b/prove_withdrawal.go
@@ -44,6 +44,8 @@ type WithdrawalProof struct {
 type StateRootProof struct {
 	BeaconStateRoot phase0.Root `json:"beaconStateRoot"`
 	StateRootProof  Proof       `json:"stateRootProof"`
+	Slot            phase0.Slot `json:"slot"`
+	SlotRootProof   Proof       `json:"slotRootProof"` //Note:  this slot root is oracle block root being used to prove partial withdrawals is after the specified range of blocks requested by the user
 }
 
 const FIRST_CAPELLA_SLOT_GOERLI = uint64(5193728)
@@ -101,6 +103,14 @@ func (epp *EigenPodProofs) ProveWithdrawals(
 		return nil, err
 	}
 
+	// Note: this slot and slot root proof are used for partial withdrawal proofs to ensure that the oracle root slot is after the specified range of blocks requested by the user
+	verifyAndProcessWithdrawalCallParams.StateRootProof.Slot = oracleBlockHeader.Slot
+
+	verifyAndProcessWithdrawalCallParams.StateRootProof.SlotRootProof, err = ProveSlotAgainstBlockHeader(oracleBlockHeader)
+	if err != nil {
+		return nil, err
+	}
+
 	verifyAndProcessWithdrawalCallParams.OracleTimestamp = GetSlotTimestamp(oracleBeaconState, oracleBlockHeader)
 
 	verifyAndProcessWithdrawalCallParams.WithdrawalProofs = make([]*WithdrawalProof, len(withdrawalBlocks))