From 38a8936b6a003d20348583d534e25ad22b7323ca Mon Sep 17 00:00:00 2001
From: fearlessfe <505380967@qq.com>
Date: Thu, 17 Oct 2024 19:47:27 +0800
Subject: [PATCH 1/2] feat: rpc api change

---
 portalnetwork/beacon/api.go  | 4 ++--
 portalnetwork/history/api.go | 4 ++--
 portalnetwork/state/api.go   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/portalnetwork/beacon/api.go b/portalnetwork/beacon/api.go
index a74455759df0..d62ed49bf4f6 100644
--- a/portalnetwork/beacon/api.go
+++ b/portalnetwork/beacon/api.go
@@ -48,7 +48,7 @@ func (p *API) BeaconRecursiveFindNodes(nodeId string) ([]string, error) {
 	return p.RecursiveFindNodes(nodeId)
 }
 
-func (p *API) BeaconRecursiveFindContent(contentKeyHex string) (*discover.ContentInfo, error) {
+func (p *API) BeaconGetContent(contentKeyHex string) (*discover.ContentInfo, error) {
 	return p.RecursiveFindContent(contentKeyHex)
 }
 
@@ -64,7 +64,7 @@ func (p *API) BeaconGossip(contentKeyHex, contentHex string) (int, error) {
 	return p.Gossip(contentKeyHex, contentHex)
 }
 
-func (p *API) BeaconTraceRecursiveFindContent(contentKeyHex string) (*discover.TraceContentResult, error) {
+func (p *API) BeaconTraceGetContent(contentKeyHex string) (*discover.TraceContentResult, error) {
 	return p.TraceRecursiveFindContent(contentKeyHex)
 }
 
diff --git a/portalnetwork/history/api.go b/portalnetwork/history/api.go
index 62245eed1523..bafdb4ea7a6f 100644
--- a/portalnetwork/history/api.go
+++ b/portalnetwork/history/api.go
@@ -48,7 +48,7 @@ func (p *API) HistoryRecursiveFindNodes(nodeId string) ([]string, error) {
 	return p.RecursiveFindNodes(nodeId)
 }
 
-func (p *API) HistoryRecursiveFindContent(contentKeyHex string) (*discover.ContentInfo, error) {
+func (p *API) HistoryGetContent(contentKeyHex string) (*discover.ContentInfo, error) {
 	return p.RecursiveFindContent(contentKeyHex)
 }
 
@@ -64,7 +64,7 @@ func (p *API) HistoryGossip(contentKeyHex, contentHex string) (int, error) {
 	return p.Gossip(contentKeyHex, contentHex)
 }
 
-func (p *API) HistoryTraceRecursiveFindContent(contentKeyHex string) (*discover.TraceContentResult, error) {
+func (p *API) HistoryTraceGetContent(contentKeyHex string) (*discover.TraceContentResult, error) {
 	return p.TraceRecursiveFindContent(contentKeyHex)
 }
 
diff --git a/portalnetwork/state/api.go b/portalnetwork/state/api.go
index 875e1ab24880..87afdf73b92f 100644
--- a/portalnetwork/state/api.go
+++ b/portalnetwork/state/api.go
@@ -48,7 +48,7 @@ func (p *API) StateRecursiveFindNodes(nodeId string) ([]string, error) {
 	return p.RecursiveFindNodes(nodeId)
 }
 
-func (p *API) StateRecursiveFindContent(contentKeyHex string) (*discover.ContentInfo, error) {
+func (p *API) StateGetContent(contentKeyHex string) (*discover.ContentInfo, error) {
 	return p.RecursiveFindContent(contentKeyHex)
 }
 
@@ -64,7 +64,7 @@ func (p *API) StateGossip(contentKeyHex, contentHex string) (int, error) {
 	return p.Gossip(contentKeyHex, contentHex)
 }
 
-func (p *API) StateTraceRecursiveFindContent(contentKeyHex string) (*discover.TraceContentResult, error) {
+func (p *API) StateTraceGetContent(contentKeyHex string) (*discover.TraceContentResult, error) {
 	return p.TraceRecursiveFindContent(contentKeyHex)
 }
 

From 07f0aeef155c07f00be4f7e558447a69df8155df Mon Sep 17 00:00:00 2001
From: fearlseefe <505380967@qq.com>
Date: Fri, 18 Oct 2024 09:38:50 +0800
Subject: [PATCH 2/2] feat: lint error

---
 portalnetwork/history/history_network.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portalnetwork/history/history_network.go b/portalnetwork/history/history_network.go
index dc9360e2b2f7..e102902299e8 100644
--- a/portalnetwork/history/history_network.go
+++ b/portalnetwork/history/history_network.go
@@ -303,7 +303,7 @@ func validateBlockBody(body *types.Body, header *types.Header) error {
 
 // EncodeBlockBody encode types.Body to ssz bytes
 func EncodeBlockBody(body *types.Body) ([]byte, error) {
-	if body.Withdrawals != nil && len(body.Withdrawals) > 0 {
+	if len(body.Withdrawals) > 0 {
 		blockShanghai, err := toPortalBlockBodyShanghai(body)
 		if err != nil {
 			return nil, err