chore: bump akash fork of cosmos-sdk

Signed-off-by: Artur Troian <troian@users.noreply.github.com>

Author: troian

go.mod

@@ -64,7 +64,7 @@ replace (
 	// use akash fork of cometbft
 	github.com/cometbft/cometbft => github.com/akash-network/cometbft v0.38.21-akash.1
 	// use akash fork of cosmos sdk
-	github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.6-akash.1
+	github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.7-akash.1
 
 	github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2
 
@@ -98,7 +98,6 @@ require (
 	cloud.google.com/go/iam v1.5.2 // indirect
 	cloud.google.com/go/monitoring v1.24.2 // indirect
 	cloud.google.com/go/storage v1.50.0 // indirect
-	cosmossdk.io/log v1.6.1 // indirect
 	cosmossdk.io/x/tx v0.14.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect

go.sum

@@ -1219,8 +1219,6 @@ cosmossdk.io/errors v1.0.2 h1:wcYiJz08HThbWxd/L4jObeLaLySopyyuUFB5w4AGpCo=
 cosmossdk.io/errors v1.0.2/go.mod h1:0rjgiHkftRYPj//3DrD6y8hcm40HcPv/dR4R/4efr0k=
 cosmossdk.io/log v1.6.1 h1:YXNwAgbDwMEKwDlCdH8vPcoggma48MgZrTQXCfmMBeI=
 cosmossdk.io/log v1.6.1/go.mod h1:gMwsWyyDBjpdG9u2avCFdysXqxq28WJapJvu+vF1y+E=
-cosmossdk.io/log/v2 v2.1.0 h1:oWLWqZ1UObWu5hIS3dvTW7QyjtvlmSzC3LOy04U/hVI=
-cosmossdk.io/log/v2 v2.1.0/go.mod h1:zDNpuRD2sWw4zuw1lZYg/jxKftVG+VizgcWAWkIorwY=
 cosmossdk.io/math v1.5.3 h1:WH6tu6Z3AUCeHbeOSHg2mt9rnoiUWVWaQ2t6Gkll96U=
 cosmossdk.io/math v1.5.3/go.mod h1:uqcZv7vexnhMFJF+6zh9EWdm/+Ylyln34IvPnBauPCQ=
 cosmossdk.io/schema v1.1.0 h1:mmpuz3dzouCoyjjcMcA/xHBEmMChN+EHh8EHxHRHhzE=
@@ -1289,8 +1287,8 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/akash-network/cometbft v0.38.21-akash.1 h1:li8x87YansHyID6VBTOxe/yBLRcdb6lQnjAeTvnMn/w=
 github.com/akash-network/cometbft v0.38.21-akash.1/go.mod h1:UCu8dlHqvkAsmAFmWDRWNZJPlu6ya2fTWZlDrWsivwo=
-github.com/akash-network/cosmos-sdk v0.53.6-akash.1 h1:Da37/oS0rbO77FfUNbcNeYp9oKZr2ktV3jhA1sjv+KY=
-github.com/akash-network/cosmos-sdk v0.53.6-akash.1/go.mod h1:ZKpVIHvKJgJJqOO2DpIJTwSyuKC0ekgIySUJsEPKnFs=
+github.com/akash-network/cosmos-sdk v0.53.7-akash.1 h1:1Ck4izBdr50qPHFueBCICVxRO1CXqZShAyOyLCXh5pU=
+github.com/akash-network/cosmos-sdk v0.53.7-akash.1/go.mod h1:ZKpVIHvKJgJJqOO2DpIJTwSyuKC0ekgIySUJsEPKnFs=
 github.com/akash-network/gogoproto v1.7.0-akash.2 h1:zY5seM6kBOLMBWn15t8vrY1ao4J1HjrhNaEeO/Soro0=
 github.com/akash-network/gogoproto v1.7.0-akash.2/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
 github.com/akash-network/ledger-go v0.16.0 h1:75oasauaV0dNGOgMB3jr/rUuxJC0gHDdYYnQW+a4bvg=

testutil/network/rpc.go

@@ -14,15 +14,17 @@ import (
 // needed by DiscoverClient to detect the API version.
 type LocalRPCClient struct {
 	*local.Local
+	registry *aclient.VersionRegistry
 }
 
 // NewLocalRPCClient creates a new LocalRPCClient wrapping the local client
-func NewLocalRPCClient(lc *local.Local) *LocalRPCClient {
-	return &LocalRPCClient{Local: lc}
+// with a local registry instance to avoid mutating global discovery state.
+func NewLocalRPCClient(lc *local.Local, registry *aclient.VersionRegistry) *LocalRPCClient {
+	return &LocalRPCClient{Local: lc, registry: registry}
 }
 
 // Akash implements the RPCClient interface required by chain-sdk.
-// Returns version discovery info from the global registry.
+// Returns version discovery info from the local registry.
 func (c *LocalRPCClient) Akash(_ context.Context) (*aclient.Akash, error) {
-	return aclient.GetRegistry().ToAkash(), nil
+	return c.registry.ToAkash(), nil
 }

testutil/network/util.go

@@ -48,9 +48,9 @@ func startInProcess(cfg Config, val *Validator) error {
 	app := cfg.AppConstructor(*val)
 	val.app = app
 
-	aclient.SetRegistry(aclient.DefaultRegistry(
+	registry := aclient.DefaultRegistry(
 		aclient.WithChainID(cfg.ChainID),
-	))
+	)
 
 	appGenesisProvider := func() (node.ChecksummedGenesisDoc, error) {
 		appGenesis, err := genutiltypes.AppGenesisFromFile(cmtCfg.GenesisFile())
@@ -90,7 +90,7 @@ func startInProcess(cfg Config, val *Validator) error {
 	val.tmNode = tmNode
 
 	if val.RPCAddress != "" {
-		val.RPCClient = NewLocalRPCClient(local.New(tmNode))
+		val.RPCClient = NewLocalRPCClient(local.New(tmNode), registry)
 	}
 
 	// We'll need a RPC client if the validator exposes a gRPC or REST endpoint.

upgrades/software/v2.1.0/market.go

@@ -12,7 +12,7 @@ type marketMigrations struct {
 }
 
 func newMarketMigration(m utypes.Migrator) utypes.Migration {
-	return deploymentMigrations{Migrator: m}
+	return marketMigrations{Migrator: m}
 }
 
 func (m marketMigrations) GetHandler() sdkmodule.MigrationHandler {