EncodingConfig Changes

Author: Zartaj0

app/app.go

@@ -127,12 +127,12 @@ import (
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 
-	appparams "pushchain/app/params"
+	// appparams "pushchain/app/params"
 	"pushchain/docs"
 )
 
 const (
-	AccountAddressPrefix = "cosmos"
+	AccountAddressPrefix = "push"
 	Name                 = "pushchain"
 )
 
@@ -290,11 +290,11 @@ func New(
 	skipUpgradeHeights map[int64]bool,
 	homePath string,
 	invCheckPeriod uint,
-	encodingConfig appparams.EncodingConfig,
+	encodingConfig ethermint.EncodingConfig,
 	appOpts servertypes.AppOptions,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *App {
-	appCodec := encodingConfig.Marshaler
+	appCodec := encodingConfig.Codec
 	cdc := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 	txConfig := encodingConfig.TxConfig

app/encoding.go

@@ -1,35 +1,37 @@
 package app
 
 import (
-	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/cosmos/cosmos-sdk/codec/types"
+	// "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/cosmos/cosmos-sdk/x/auth/tx"
+	evmenc "github.com/zeta-chain/ethermint/encoding"
+	ethermint "github.com/zeta-chain/ethermint/types"
 
-	"pushchain/app/params"
+	// "pushchain/app/params"
 )
 
 // makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
-func makeEncodingConfig() params.EncodingConfig {
-	amino := codec.NewLegacyAmino()
-	interfaceRegistry := types.NewInterfaceRegistry()
-	marshaler := codec.NewProtoCodec(interfaceRegistry)
-	txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes)
+// func makeEncodingConfig() params.EncodingConfig {
+// 	amino := codec.NewLegacyAmino()
+// 	interfaceRegistry := types.NewInterfaceRegistry()
+// 	marshaler := codec.NewProtoCodec(interfaceRegistry)
+// 	txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes)
 
-	return params.EncodingConfig{
-		InterfaceRegistry: interfaceRegistry,
-		Marshaler:         marshaler,
-		TxConfig:          txCfg,
-		Amino:             amino,
-	}
-}
+// 	return params.EncodingConfig{
+// 		InterfaceRegistry: interfaceRegistry,
+// 		Marshaler:         marshaler,
+// 		TxConfig:          txCfg,
+// 		Amino:             amino,
+// 	}
+// }
 
 // MakeEncodingConfig creates an EncodingConfig for testing
-func MakeEncodingConfig() params.EncodingConfig {
-	encodingConfig := makeEncodingConfig()
-	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+func MakeEncodingConfig() ethermint.EncodingConfig {
+	encodingConfig := evmenc.MakeConfig(ModuleBasics)
+	// std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	// ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig
 }