fix keyring encoding

tspnetwork · Jan 31, 2024 · fe04384 · fe04384
1 parent a43c2c2
commit fe04384
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/app/app.go b/app/app.go
@@ -10,6 +10,7 @@ import (
 
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
+	appparams "cosmossdk.io/simapp/params"
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/libs/log"
@@ -117,7 +118,6 @@ import (
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
-	appparams "github.com/tspnetwork/tspchain/app/params"
 	"github.com/tspnetwork/tspchain/docs"
 
 	evmante "github.com/evmos/ethermint/app/ante"
@@ -299,7 +299,7 @@ func New(
 	appOpts servertypes.AppOptions,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *App {
-	appCodec := encodingConfig.Marshaler
+	appCodec := encodingConfig.Codec
 	cdc := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig

diff --git a/app/encoding.go b/app/encoding.go
@@ -1,12 +1,12 @@
 package app
 
 import (
+	"cosmossdk.io/simapp/params"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/std"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 
-	"github.com/tspnetwork/tspchain/app/params"
+	evmenc "github.com/evmos/ethermint/encoding"
 )
 
 // makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
@@ -18,18 +18,13 @@ func makeEncodingConfig() params.EncodingConfig {
 
 	return params.EncodingConfig{
 		InterfaceRegistry: interfaceRegistry,
-		Marshaler:         marshaler,
+		Codec:             marshaler,
 		TxConfig:          txCfg,
 		Amino:             amino,
 	}
 }
 
 // MakeEncodingConfig creates an EncodingConfig for testing
 func MakeEncodingConfig() params.EncodingConfig {
-	encodingConfig := makeEncodingConfig()
-	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	return encodingConfig
+	return evmenc.MakeConfig(ModuleBasics)
 }
diff --git a/cmd/tspchaind/cmd/root.go b/cmd/tspchaind/cmd/root.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	appparams "cosmossdk.io/simapp/params"
 	dbm "github.com/cometbft/cometbft-db"
 	tmcfg "github.com/cometbft/cometbft/config"
 	tmcli "github.com/cometbft/cometbft/libs/cli"
@@ -36,7 +37,6 @@ import (
 	// this line is used by starport scaffolding # root/moduleImport
 
 	"github.com/tspnetwork/tspchain/app"
-	appparams "github.com/tspnetwork/tspchain/app/params"
 
 	ethermintclient "github.com/evmos/ethermint/client"
 	ethcfg "github.com/evmos/ethermint/cmd/config"
@@ -54,7 +54,7 @@ const AddrLen = 20
 func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {
 	encodingConfig := app.MakeEncodingConfig()
 	initClientCtx := client.Context{}.
-		WithCodec(encodingConfig.Marshaler).
+		WithCodec(encodingConfig.Codec).
 		WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
 		WithTxConfig(encodingConfig.TxConfig).
 		WithLegacyAmino(encodingConfig.Amino).