Merge remote-tracking branch 'upstream/main' into feat/grpc

node/tests/header_ex.rs

@@ -236,7 +236,7 @@ async fn head_selection_with_multiple_peers() {
 
     new_b_node.wait_connected().await.unwrap();
     // small delay needed for client to include new_b_node in head selection process
-    sleep(Duration::from_millis(50)).await;
+    sleep(Duration::from_millis(100)).await;
 
     // now 2 nodes agree on head with height 25
     let network_head = client.request_head_header().await.unwrap();

tools/update-proto-vendor.sh

@@ -23,7 +23,7 @@ rm -rf ../target/proto-vendor-src
 mkdir -p ../target/proto-vendor-src
 
 extract_urls ../target/proto-vendor-src \
-    https://github.com/celestiaorg/celestia-app/archive/refs/tags/v2.3.1.tar.gz \
+    https://github.com/celestiaorg/celestia-app/archive/refs/tags/v2.3.0.tar.gz \
     https://github.com/celestiaorg/celestia-core/archive/refs/heads/v0.34.x-celestia.tar.gz \
     https://github.com/celestiaorg/celestia-node/archive/refs/heads/main.tar.gz \
     https://github.com/celestiaorg/cosmos-sdk/archive/refs/heads/release/v0.46.x-celestia.tar.gz \
@@ -36,7 +36,7 @@ extract_urls ../target/proto-vendor-src \
 mkdir -p vendor
 
 rm -rf vendor/celestia
-cp -r ../target/proto-vendor-src/celestia-app-2.3.1/proto/celestia vendor
+cp -r ../target/proto-vendor-src/celestia-app-2.3.0/proto/celestia vendor
 
 rm -rf vendor/go-header
 mkdir -p vendor/go-header/p2p
@@ -63,8 +63,8 @@ cp -r ../target/proto-vendor-src/celestia-node-main/header/pb vendor/header
 
 rm -rf vendor/share
 mkdir -p vendor/share
-main_dir=../target/proto-vendor-src/celestia-node-main/share
-find "$main_dir" -name pb -type d -print0 | while read -r -d '' pb_dir; do
+shwap_dir=../target/proto-vendor-src/celestia-node-main/share
+find "$shwap_dir" -name pb -type d -print0 | while read -r -d '' pb_dir; do
   # remove prefix
   out_dir="${pb_dir#"$main_dir"}"
   # remove /pb suffix