chore: bump versions of app/sdk/core dependencies to latest (celestia…

…org#736)

Co-authored-by: Wondertan <[email protected]>

Makefile

@@ -41,7 +41,7 @@ install-shed:
 fmt:
 	@find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs gofmt -w -s
 	@find . -name '*.go' -type f -not -path "*.git*"  -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/celestiaorg
-	@go mod tidy
+	@go mod tidy -compat=1.17
 .PHONY: fmt
 
 ## lint: Linting *.go files using golangci-lint. Look for .golangci.yml for the list of linters.

cmd/celestia/main.go

@@ -5,16 +5,19 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/tendermint/spm/cosmoscmd"
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-node/cmd"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func init() {
 	// This is necessary to ensure that the account addresses are correctly prefixed
 	// as in the celestia application.
-	cosmoscmd.SetPrefixes(app.AccountAddressPrefix)
+	cfg := sdk.GetConfig()
+	cfg.SetBech32PrefixForAccount(app.Bech32PrefixAccAddr, app.Bech32PrefixAccPub)
+	cfg.Seal()
 
 	rootCmd.AddCommand(
 		bridgeCmd,

core/client.go

@@ -21,7 +21,6 @@ func NewRemote(protocol, remoteAddr string) (Client, error) {
 
 	return http.NewWithClient(
 		fmt.Sprintf("%s://%s", protocol, remoteAddr),
-		"/websocket",
 		httpClient.StandardClient(),
 	)
 }

core/client_test.go

@@ -8,22 +8,22 @@ import (
 )
 
 func TestRemoteClient_Status(t *testing.T) {
-	_, client := StartTestClient(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
+	_, client := StartTestClient(ctx, t)
+
 	status, err := client.Status(ctx)
 	require.NoError(t, err)
 	require.NotNil(t, status)
 }
 
 func TestRemoteClient_StartBlockSubscription_And_GetBlock(t *testing.T) {
-	_, client := StartTestClient(t)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
+	_, client := StartTestClient(ctx, t)
+
 	eventChan, err := client.Subscribe(ctx, newBlockSubscriber, newBlockEventQuery)
 	require.NoError(t, err)
 

core/fetcher.go

@@ -13,7 +13,7 @@ const newBlockSubscriber = "NewBlock/Events"
 
 var (
 	log                = logging.Logger("core/fetcher")
-	newBlockEventQuery = types.QueryForEvent(types.EventNewBlock).String()
+	newBlockEventQuery = types.QueryForEvent(types.EventNewBlockValue).String()
 )
 
 type BlockFetcher struct {

core/fetcher_test.go

@@ -11,12 +11,12 @@ import (
 )
 
 func TestBlockFetcher_GetBlock_and_SubscribeNewBlockEvent(t *testing.T) {
-	_, client := StartTestClient(t)
-	fetcher := NewBlockFetcher(client)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
+	_, client := StartTestClient(ctx, t)
+	fetcher := NewBlockFetcher(client)
+
 	// generate some blocks
 	newBlockChan, err := fetcher.SubscribeNewBlockEvent(ctx)
 	require.NoError(t, err)
@@ -36,12 +36,12 @@ func TestBlockFetcher_GetBlock_and_SubscribeNewBlockEvent(t *testing.T) {
 // TestBlockFetcherHeaderValues tests that both the Commit and ValidatorSet
 // endpoints are working as intended.
 func TestBlockFetcherHeaderValues(t *testing.T) {
-	_, client := StartTestClient(t)
-	fetcher := NewBlockFetcher(client)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
+	_, client := StartTestClient(ctx, t)
+	fetcher := NewBlockFetcher(client)
+
 	// generate some blocks
 	newBlockChan, err := fetcher.SubscribeNewBlockEvent(ctx)
 	require.NoError(t, err)