Merge branch 'main' into patch-1

.gitignore

@@ -49,6 +49,7 @@ coverage.out
 example/cosmwasm/echo/target
 example/cosmwasm/cw20/target
 example/cosmwasm/cw721/target
+example/cosmwasm/cw1155/target
 
 # Solidity contracts artifacts
 contracts/artifacts

CHANGELOG.md

@@ -27,6 +27,54 @@ Ref: https://keepachangelog.com/en/1.0.0/
 -->
 
 # Changelog
+## v6.0.1
+sei-chain
+* [#1956](https://github.com/sei-protocol/sei-chain/pull/1956) Assign owner correctly when there are multiple transfers
+* [#1955](https://github.com/sei-protocol/sei-chain/pull/1955) Add missing modules to migration and add command to export IAVL
+* [#1954](https://github.com/sei-protocol/sei-chain/pull/1954) Enable Queries to IAVL for Non-Migrating Nodes
+* [#1952](https://github.com/sei-protocol/sei-chain/pull/1952) Fix for failed txs in block
+* [#1951](https://github.com/sei-protocol/sei-chain/pull/1951) Add max base fee as a param
+* [#1949](https://github.com/sei-protocol/sei-chain/pull/1949) Be resilient to failing txs in debug trace block
+* [#1941](https://github.com/sei-protocol/sei-chain/pull/1941) Fix eth_getLogs missing events early return
+* [#1932](https://github.com/sei-protocol/sei-chain/pull/1932) Use owner event to populate ERC721 transfer topic
+* [#1930](https://github.com/sei-protocol/sei-chain/pull/1930) Exclude cosmos txs from base fee calculation
+* [#1926](https://github.com/sei-protocol/sei-chain/pull/1926) Refactor x/bank precompile to use dynamic gas
+* [#1922](https://github.com/sei-protocol/sei-chain/pull/1922) Use msg server send in bank precompile
+* [#1913](https://github.com/sei-protocol/sei-chain/pull/1913) Use tendermint store to get Tx hashes instead of storing explicitly
+* [#1906](https://github.com/sei-protocol/sei-chain/pull/1906) Remove vue code
+* [#1908](https://github.com/sei-protocol/sei-chain/pull/1908) QuerySmart to always use cached ctx
+
+
+sei-cosmos
+* [#551](https://github.com/sei-protocol/sei-cosmos/pull/551) Param change verification
+* [#553](https://github.com/sei-protocol/sei-cosmos/pull/553) Remove unnecessary serving logs
+
+sei-wasmd
+* [#67](https://github.com/sei-protocol/sei-wasmd/pull/67) Emit CW721 token owner before transfer
+* [#65](https://github.com/sei-protocol/sei-wasmd/pull/65) Add QuerySmartSafe in WasmViewKeeper
+
+
+## v6.0.0
+sei-chain
+* [#1905](https://github.com/sei-protocol/sei-chain/pull/1905) Use limited wasm gas meter
+* [#1889](https://github.com/sei-protocol/sei-chain/pull/1889) Fix amino registry for custom modules
+* [#1888](https://github.com/sei-protocol/sei-chain/pull/1888) Set EIP-1559 default values
+* [#1884](https://github.com/sei-protocol/sei-chain/pull/1884) Update gas tip cap param range
+* [#1878](https://github.com/sei-protocol/sei-chain/pull/1878) Add endpoint to estimate gas after simulating calls
+
+sei-cosmos
+* [#547](https://github.com/sei-protocol/sei-cosmos/pull/547) Do not early return for validated tasks in synchronous mode
+* [#544](https://github.com/sei-protocol/sei-cosmos/pull/544) Only apply DeliverTx hooks if there is no error
+* [#538](https://github.com/sei-protocol/sei-cosmos/pull/538) Token allowlist feature
+
+sei-tendermint
+* [#248](https://github.com/sei-protocol/sei-tendermint/pull/248) Improve Peer Score algorithm
+* [#245](https://github.com/sei-protocol/sei-tendermint/pull/245) Exclude unconditional peers when connection limit checking
+* [#244](https://github.com/sei-protocol/sei-tendermint/pull/244) Add new config to speed up block sync
+
+sei-db
+* [#75](https://github.com/sei-protocol/sei-db/pull/75) Online archive node migration
+
 ## v5.9.0
 sei-chain
 * [#1867](https://github.com/sei-protocol/sei-chain/pull/1867) Add synthetic events in separate sei endpoints

app/app.go

@@ -368,6 +368,7 @@ type App struct {
 
 	genesisImportConfig genesistypes.GenesisImportConfig
 
+	stateStore   seidb.StateStore
 	receiptStore seidb.StateStore
 }
 
@@ -396,7 +397,7 @@ func New(
 	cdc := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 
-	bAppOptions := SetupSeiDB(logger, homePath, appOpts, baseAppOptions)
+	bAppOptions, stateStore := SetupSeiDB(logger, homePath, appOpts, baseAppOptions)
 
 	bApp := baseapp.NewBaseApp(AppName, logger, db, encodingConfig.TxConfig.TxDecoder(), tmConfig, appOpts, bAppOptions...)
 	bApp.SetCommitMultiStoreTracer(traceStore)
@@ -429,6 +430,7 @@ func New(
 		versionInfo:       version.NewInfo(),
 		metricCounter:     &map[string]float32{},
 		encodingConfig:    encodingConfig,
+		stateStore:        stateStore,
 	}
 
 	for _, option := range appOptions {
@@ -532,19 +534,13 @@ func New(
 	).SetHooks(epochmoduletypes.NewMultiEpochHooks(
 		app.MintKeeper.Hooks()))
 
-	tokenFactoryConfig, err := tokenfactorykeeper.ReadConfig(appOpts)
-	if err != nil {
-		panic(fmt.Sprintf("error reading token factory config due to %s", err))
-	}
-
 	app.TokenFactoryKeeper = tokenfactorykeeper.NewKeeper(
 		appCodec,
 		app.keys[tokenfactorytypes.StoreKey],
 		app.GetSubspace(tokenfactorytypes.ModuleName),
 		app.AccountKeeper,
 		app.BankKeeper.(bankkeeper.BaseKeeper).WithMintCoinsRestriction(tokenfactorytypes.NewTokenFactoryDenomMintCoinsRestriction()),
 		app.DistrKeeper,
-		tokenFactoryConfig,
 	)
 
 	// The last arguments can contain custom message handlers, and custom query handlers,
@@ -678,7 +674,7 @@ func New(
 
 	app.GovKeeper = govkeeper.NewKeeper(
 		appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
-		&stakingKeeper, govRouter,
+		&stakingKeeper, app.ParamsKeeper, govRouter,
 	)
 
 	// this line is used by starport scaffolding # stargate/app/keeperDefinition
@@ -695,6 +691,7 @@ func New(
 			false,
 			&app.EvmKeeper,
 			app.BankKeeper,
+			bankkeeper.NewMsgServerImpl(app.BankKeeper),
 			wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper),
 			app.WasmKeeper,
 			stakingkeeper.NewMsgServerImpl(app.StakingKeeper),
@@ -1064,6 +1061,9 @@ func (app *App) Name() string { return app.BaseApp.Name() }
 // GetBaseApp returns the base app of the application
 func (app App) GetBaseApp() *baseapp.BaseApp { return app.BaseApp }
 
+// GetStateStore returns the state store of the application
+func (app App) GetStateStore() seidb.StateStore { return app.stateStore }
+
 // BeginBlocker application updates every begin block
 func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 	metrics.GaugeSeidVersionAndCommit(app.versionInfo.Version, app.versionInfo.GitCommit)
@@ -1599,15 +1599,17 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req BlockProcessRequ
 	lazyWriteEvents := app.BankKeeper.WriteDeferredBalances(ctx)
 	events = append(events, lazyWriteEvents...)
 
-	// Sum up total used per block
-	blockTotalGasUsed := int64(0)
+	// Sum up total used per block only for evm transactions
+	evmTotalGasUsed := int64(0)
 	for _, txResult := range txResults {
-		blockTotalGasUsed += txResult.GasUsed
+		if txResult.EvmTxInfo != nil {
+			evmTotalGasUsed += txResult.GasUsed
+		}
 	}
 
 	endBlockResp := app.EndBlock(ctx, abci.RequestEndBlock{
 		Height:       req.GetHeight(),
-		BlockGasUsed: blockTotalGasUsed,
+		BlockGasUsed: evmTotalGasUsed,
 	})
 
 	events = append(events, endBlockResp.Events...)

app/eth_replay.go

@@ -141,7 +141,6 @@ func BlockTest(a *App, bt *ethtests.BlockTest) {
 		}
 		params := a.EvmKeeper.GetParams(a.GetContextForDeliverTx([]byte{}))
 		params.MinimumFeePerGas = sdk.NewDecFromInt(sdk.NewInt(0))
-		// params.BaseFeePerGas = sdk.NewDecFromInt(sdk.NewInt(0))
 		a.EvmKeeper.SetParams(a.GetContextForDeliverTx([]byte{}), params)
 	}