fix

dymensionxyz · Aug 2, 2024 · d6a4cea · d6a4cea
1 parent 1b8898f
commit d6a4cea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -295,11 +295,10 @@ replace (
 	github.com/CosmWasm/wasmd => github.com/decentrio/wasmd v0.33.0-sdk46.2
 	github.com/centrifuge/go-substrate-rpc-client/v4 => github.com/availproject/go-substrate-rpc-client/v4 v4.0.12-avail-1.4.0-rc1-5e286e3
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/dymensionxyz/dymint => ../dymint
 	github.com/evmos/evmos/v12 => github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
 	github.com/gorilla/rpc => github.com/dymensionxyz/rpc v1.3.1
 	github.com/libp2p/go-libp2p-pubsub => github.com/dymensionxyz/go-libp2p-pubsub v0.0.0-20231219183151-4504d4995913
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
-	github.com/tendermint/tendermint => ../cometbft_dym
+	github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28
 )
diff --git a/go.sum b/go.sum
@@ -412,6 +412,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE
 github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI=
 github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA=
 github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M=
+github.com/cometbft/cometbft v0.34.28 h1:gwryf55P1SWMUP4nOXpRVI2D0yPoYEzN+IBqmRBOsDc=
+github.com/cometbft/cometbft v0.34.28/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw=
 github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc=
 github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs=
 github.com/cometbft/cometbft-db v0.11.0 h1:M3Lscmpogx5NTbb1EGyGDaFRdsoLWrUWimFEyf7jej8=
@@ -539,6 +541,8 @@ github.com/dymensionxyz/cosmosclient v0.4.2-beta h1:sokBefcN1tIOlUKmB8Q2E9XMJ93L
 github.com/dymensionxyz/cosmosclient v0.4.2-beta/go.mod h1:GQQu3ITEjWfi5ULR2B6X2i2YZNennY1yzcT5qdL4MGI=
 github.com/dymensionxyz/dymension/v3 v3.1.0-rc03.0.20240411195658-f7cd96f53b56 h1:cmpJYdRviuUfmlJdHrcAND8Jd6JIY4rp63bWAQzPr54=
 github.com/dymensionxyz/dymension/v3 v3.1.0-rc03.0.20240411195658-f7cd96f53b56/go.mod h1:3Pfrr8j/BR9ztNKztGfC5PqDiO6CcrzMLCJtFtPEVW4=
+github.com/dymensionxyz/dymint v1.1.3-rc04 h1:RqDF8bxB73mYmxHKnVNGeTnTsZihAwV6AElIgIDL5Xw=
+github.com/dymensionxyz/dymint v1.1.3-rc04/go.mod h1:e04A2OxeowtxMC9jl4JJj/7fmcYrHEWVIbYAlEd/Byo=
 github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3 h1:vmAdUGUc4rTIiO3Phezr7vGq+0uPDVKSA4WAe8+yl6w=
 github.com/dymensionxyz/evmos/v12 v12.1.6-dymension-v0.3/go.mod h1:LfPv2O1HXMgETpka81Pg3nXy+U/7urq8dn85ZnSXK5Y=
 github.com/dymensionxyz/gerr-cosmos v1.0.0 h1:oi91rgOkpJWr41oX9JOyjvvBnhGY54tj513x8VlDAEc=

diff --git a/server/commands/rollback.go b/server/commands/rollback.go
@@ -8,6 +8,8 @@ import (
 	"github.com/dymensionxyz/dymint/block"
 	dymintconf "github.com/dymensionxyz/dymint/config"
 	dymintconv "github.com/dymensionxyz/dymint/conv"
+	daregistry "github.com/dymensionxyz/dymint/da/registry"
+
 	"github.com/dymensionxyz/dymint/store"
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/node"
@@ -51,7 +53,7 @@ func RollbackCmd(appCreator types.AppCreator) *cobra.Command {
 				err = db.Close()
 			}()
 
-			nodeConfig := dymintconf.DefaultConfig("")
+			nodeConfig := dymintconf.DefaultConfig("", "")
 			err = nodeConfig.GetViperConfig(cmd, ctx.Viper.GetString(flags.FlagHome))
 			if err != nil {
 				return err
@@ -121,13 +123,19 @@ func liteBlockManager(context context.Context, cfg *config.Config, dymintConf *d
 	mainKV := store.NewPrefixKV(baseKV, []byte{0})
 	s := store.New(mainKV)
 
+	dalc := daregistry.GetClient(dymintConf.DALayer)
+	if dalc == nil {
+		return nil, fmt.Errorf("get data availability client named '%s'", dymintConf.DALayer)
+	}
+
 	blockManager, err := block.NewManager(
 		signingKey,
-		*dymintConf,
+		dymintConf.BlockManagerConfig,
 		genesis,
 		s,
 		nil,
 		proxyApp,
+		dalc,
 		nil,
 		nil,
 		nil,

diff --git a/x/rollappparams/types/params.go b/x/rollappparams/types/params.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	"github.com/dymensionxyz/dymint/da"
 	"github.com/dymensionxyz/dymint/da/registry"
 )
 
@@ -53,7 +52,7 @@ func (p Params) Validate() error {
 
 func assertValidDa(i any) error {
 	if registry.GetClient(i.(string)) == nil {
-		return da.ErrNonexistentDA
+		return ErrDANotSupported
 	}
 	return nil