cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

upgrade to ethermint v0.21.0 #99

Closed
0xmuralik wants to merge 384 commits from murali/update-fork into main
pull from: murali/update-fork
merge into: cerc-io:main
Conversation 1 Commits 384 Files Changed 309 +5 -7
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be3d3b7093 - Show all commits

4
app/app.go
View File

@ -188,7 +188,7 @@ var (
stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking}, stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
govtypes.ModuleName: {authtypes.Burner}, govtypes.ModuleName: {authtypes.Burner},
ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner},
evmtypes.ModuleName: {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account evmtypes.ModuleName: {authtypes.Minter, authtypes.Burner}, //nolint:lll // used for secure addition and subtraction of balance using module account
auctiontypes.ModuleName: nil, auctiontypes.ModuleName: nil,
auctiontypes.AuctionBurnModuleAccountName: nil, auctiontypes.AuctionBurnModuleAccountName: nil,
registrytypes.ModuleName: nil, registrytypes.ModuleName: nil,
@ -715,7 +715,7 @@ func (app *EthermintApp) setAnteHandler(txConfig client.TxConfig, maxGasWanted u
FeeMarketKeeper: app.FeeMarketKeeper, FeeMarketKeeper: app.FeeMarketKeeper,
MaxTxGasWanted: maxGasWanted, MaxTxGasWanted: maxGasWanted,
ExtensionOptionChecker: ethermint.HasDynamicFeeExtensionOption, ExtensionOptionChecker: ethermint.HasDynamicFeeExtensionOption,
TxFeeChecker: ante.NewDynamicFeeChecker(app.EvmKeeper), // TxFeeChecker: ante.NewDynamicFeeChecker(app.EvmKeeper),
}) })
if err != nil { if err != nil {
panic(err) panic(err)

4
cmd/laconicd/root.go
View File

@ -44,7 +44,7 @@ import (
ethermint "github.com/cerc-io/laconicd/types" ethermint "github.com/cerc-io/laconicd/types"
) )
const EnvPrefix = "ETHERMINT" const EnvPrefix = "LACONIC"
// NewRootCmd creates a new root command for simd. It is called once in the // NewRootCmd creates a new root command for simd. It is called once in the
// main function. // main function.
@ -66,7 +66,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
rootCmd := &cobra.Command{ rootCmd := &cobra.Command{
Use: "laconicd", Use: "laconicd",
Short: "Ethermint Daemon", Short: "Laconic Daemon",
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
// set the default command outputs // set the default command outputs
cmd.SetOut(cmd.OutOrStdout()) cmd.SetOut(cmd.OutOrStdout())

4
x/auction/client/testutil/common.go
View File

@ -57,10 +57,9 @@ func (s *IntegrationTestSuite) TearDownSuite() {
func (s *IntegrationTestSuite) createAccountWithBalance(accountName string, accountAddress *string) { func (s *IntegrationTestSuite) createAccountWithBalance(accountName string, accountAddress *string) {
val := s.network.Validators[0] val := s.network.Validators[0]
fmt.Println("Validator===========", val.Address)
sr := s.Require() sr := s.Require()
info, _, err := val.ClientCtx.Keyring.NewMnemonic(accountName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.EthSecp256k1) info, _, err := val.ClientCtx.Keyring.NewMnemonic(accountName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, hd.EthSecp256k1) //nolint:lll
sr.NoError(err) sr.NoError(err)
newAddr, _ := info.GetAddress() newAddr, _ := info.GetAddress()
@ -77,5 +76,4 @@ func (s *IntegrationTestSuite) createAccountWithBalance(accountName string, acco
) )
sr.NoError(err) sr.NoError(err)
*accountAddress = newAddr.String() *accountAddress = newAddr.String()
fmt.Println("Account address=====", newAddr.String())
} }