Merge branch 'main' into bump_otel_version

go.mod

@@ -8,9 +8,9 @@ require (
 	cosmossdk.io/math v1.0.0-beta.3
 	github.com/BurntSushi/toml v1.2.1
 	github.com/alecthomas/jsonschema v0.0.0-20200530073317-71f438968921
-	github.com/celestiaorg/celestia-app v0.12.0-rc4
+	github.com/celestiaorg/celestia-app v0.12.0-rc5
 	github.com/celestiaorg/go-libp2p-messenger v0.1.0
-	github.com/celestiaorg/nmt v0.12.0
+	github.com/celestiaorg/nmt v0.14.0
 	github.com/celestiaorg/rsmt2d v0.8.0
 	github.com/cosmos/cosmos-sdk v0.46.7
 	github.com/cosmos/cosmos-sdk/api v0.1.0
@@ -322,9 +322,9 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6
+	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.7.0-sdk-v0.46.7
 	github.com/filecoin-project/dagstore => github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/libp2p/go-libp2p => github.com/Wondertan/go-libp2p v0.5.3-0.20230126212817-d54022334dbe
-	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23
+	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.14.0-tm-v0.34.23
 )

go.sum

@@ -197,12 +197,12 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/celestiaorg/celestia-app v0.12.0-rc4 h1:sy7zq44EpRHi1Max5Cjw4fCQY7/rPphdoGwRgQu1Poo=
-github.com/celestiaorg/celestia-app v0.12.0-rc4/go.mod h1:1VLYgvVX7GQ4OD+NoymwzCEqjNdm9woG06hDx2tKA2E=
-github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23 h1:nMg928RIanyA2ICN3PHpIE6jgg+008BtD5XmxeObEhM=
-github.com/celestiaorg/celestia-core v1.13.0-tm-v0.34.23/go.mod h1:Iu2XuSzF+QG3rzd60/sGhhk3n4wOAm8YyadU80KlcMs=
-github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6 h1:G7c1qcM2WTVdiLsyHASyP4pOK7D4QsOrbXl0qP3GKpk=
-github.com/celestiaorg/cosmos-sdk v1.5.1-sdk-v0.46.6/go.mod h1:2Oq+pYLgUOdcv++AXR77Nv/Yiw4dckswSQN1iyScUqk=
+github.com/celestiaorg/celestia-app v0.12.0-rc5 h1:IyhV+wh+iznFV7K78qhNm4DCYIHxagAVolRIGV64Fgs=
+github.com/celestiaorg/celestia-app v0.12.0-rc5/go.mod h1:+N3b0GfR+twY/TajKicIeZGjFU9YnHWWzbsztxcARFU=
+github.com/celestiaorg/celestia-core v1.14.0-tm-v0.34.23 h1:8zE523TUe5W33/nheJ9umHF2d1q6iHQlqJfMXMTPe3k=
+github.com/celestiaorg/celestia-core v1.14.0-tm-v0.34.23/go.mod h1:fGDSg7aw2OH/Uze1zymop0x0y1kAPEO9OII2A2cb99Q=
+github.com/celestiaorg/cosmos-sdk v1.7.0-sdk-v0.46.7 h1:jy24W2wTCnDY843A/5hy79QP/4GNhGPtADN55zs9o6g=
+github.com/celestiaorg/cosmos-sdk v1.7.0-sdk-v0.46.7/go.mod h1:qH1Q0s96i4Op0WSh6qC72yWkoWdZNs0CY4HPUrWaK44=
 github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659 h1:f3205vw3GYBtMiNoS+qB6IuHSs50Iwqsm9lNIikLTCk=
 github.com/celestiaorg/dagstore v0.0.0-20221014072825-395797efb659/go.mod h1:ta/DlqIH10bvhwqJIw51Nq3QU4XVMp6pz3f0Deve9fM=
 github.com/celestiaorg/go-libp2p-messenger v0.1.0 h1:rFldTa3ZWcRRn8E2bRWS94Qp1GFYXO2a0uvqpIey1B8=
@@ -211,8 +211,8 @@ github.com/celestiaorg/go-verifcid v0.0.1-lazypatch h1:9TSe3w1cmJmbWlweCwCTIZkan
 github.com/celestiaorg/go-verifcid v0.0.1-lazypatch/go.mod h1:kXPYu0XqTNUKWA1h3M95UHjUqBzDwXVVt/RXZDjKJmQ=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc=
 github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4/go.mod h1:fzuHnhzj1pUygGz+1ZkB3uQbEUL4htqCGJ4Qs2LwMZA=
-github.com/celestiaorg/nmt v0.12.0 h1:6CmaMPri9FdSiytZP7yCrEq3ewebFiIEjlJhasrS6oQ=
-github.com/celestiaorg/nmt v0.12.0/go.mod h1:NN3W8EEoospv8EHCw50DDNWwPLpJkFHoEFiqCEcNCH4=
+github.com/celestiaorg/nmt v0.14.0 h1:ET1PXBm8f3KHCAB7+sRVMTmvejkpQp6HAQsGLjIRtcY=
+github.com/celestiaorg/nmt v0.14.0/go.mod h1:b+pwd9cGTSSYLZnUIQSJl07pusJdFeEvCVsVfSRH9gA=
 github.com/celestiaorg/quantum-gravity-bridge v1.3.0 h1:9zPIp7w1FWfkPnn16y3S4FpFLnQtS7rm81CUVcHEts0=
 github.com/celestiaorg/quantum-gravity-bridge v1.3.0/go.mod h1:6WOajINTDEUXpSj5UZzod16UZ96ZVB/rFNKyM+Mt1gI=
 github.com/celestiaorg/rsmt2d v0.8.0 h1:ZUxTCELZCM9zMGKNF3cT+rUqMddXMeiuyleSJPZ3Wn4=

header/pb/extended_header.proto

@@ -4,13 +4,13 @@ package header.pb;
 
 import "tendermint/types/types.proto";
 import "tendermint/types/validator.proto";
-import "da/data_availability_header.proto";
+import "celestia/da/data_availability_header.proto";
 
 message ExtendedHeader {
   tendermint.types.Header header = 1;
   tendermint.types.Commit commit = 2;
   tendermint.types.ValidatorSet validator_set = 3;
-  da.DataAvailabilityHeader dah = 4;
+  celestia.da.DataAvailabilityHeader dah = 4;
 }
 
 // Generated with:

nodebuilder/tests/p2p_test.go

@@ -226,6 +226,7 @@ func TestRestartNodeDiscovery(t *testing.T) {
 		select {
 		case <-ctx.Done():
 			require.True(t, nodes[0].Host.Network().Connectedness(node.Host.ID()) == network.Connected)
+			return
 		case conn := <-connectSub.Out():
 			status := conn.(event.EvtPeerConnectednessChanged)
 			if status.Peer != node.Host.ID() {

share/availability/discovery/discovery.go

@@ -143,27 +143,29 @@ func (d *Discovery) ensurePeers(ctx context.Context) {
 	// starting to listen to subscriptions async will help us to avoid any blocking
 	// in the case when we will not have the needed amount of FNs and will be blocked in `FindPeers`.
 	go func() {
-		select {
-		case <-ctx.Done():
-			log.Debug("Context canceled. Finish listening for connectedness events.")
-			return
-		case e, ok := <-sub.Out():
-			if !ok {
-				log.Debug("Subscription for connectedness events is closed.")
+		for {
+			select {
+			case <-ctx.Done():
+				log.Debug("Context canceled. Finish listening for connectedness events.")
 				return
-			}
-			// listen to disconnect event to remove peer from set and reset backoff time
-			// reset timer in order to restart the discovery, once stored peer is disconnected
-			connStatus := e.(event.EvtPeerConnectednessChanged)
-			if connStatus.Connectedness == network.NotConnected {
-				if d.set.Contains(connStatus.Peer) {
-					log.Debugw("removing the peer from the peer set",
-						"peer", connStatus.Peer, "status", connStatus.Connectedness.String())
-					d.connector.RestartBackoff(connStatus.Peer)
-					d.set.Remove(connStatus.Peer)
-					d.onUpdatedPeers(connStatus.Peer, false)
-					d.host.ConnManager().UntagPeer(connStatus.Peer, topic)
-					t.Reset(d.discoveryInterval)
+			case e, ok := <-sub.Out():
+				if !ok {
+					log.Debug("Subscription for connectedness events is closed.")
+					return
+				}
+				// listen to disconnect event to remove peer from set and reset backoff time
+				// reset timer in order to restart the discovery, once stored peer is disconnected
+				connStatus := e.(event.EvtPeerConnectednessChanged)
+				if connStatus.Connectedness == network.NotConnected {
+					if d.set.Contains(connStatus.Peer) {
+						log.Debugw("removing the peer from the peer set",
+							"peer", connStatus.Peer, "status", connStatus.Connectedness.String())
+						d.connector.RestartBackoff(connStatus.Peer)
+						d.set.Remove(connStatus.Peer)
+						d.onUpdatedPeers(connStatus.Peer, false)
+						d.host.ConnManager().UntagPeer(connStatus.Peer, topic)
+						t.Reset(d.discoveryInterval)
+					}
 				}
 			}
 		}