fixed support for AllowEmptyBlocks = false for autobahn

app/ante/cosmos_checktx.go

@@ -241,11 +241,6 @@ func CosmosStatelessChecks(tx sdk.Tx, height int64, consensusParams *tmproto.Con
 
 func SetGasMeter(ctx sdk.Context, gasLimit uint64, paramsKeeper paramskeeper.Keeper) sdk.Context {
 	cosmosGasParams := paramsKeeper.GetCosmosGasParams(ctx)
-
-	if ctx.BlockHeight() == 0 {
-		return ctx.WithGasMeter(storetypes.NewInfiniteMultiplierGasMeter(cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator))
-	}
-
 	return ctx.WithGasMeter(storetypes.NewMultiplierGasMeter(gasLimit, cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator))
 }
 
@@ -450,15 +445,10 @@ func CheckSignatures(ctx sdk.Context, txConfig client.TxConfig, tx sdk.Tx, signe
 		}
 
 		// retrieve signer data
-		genesis := ctx.BlockHeight() == 0
 		chainID := ctx.ChainID()
-		var accNum uint64
-		if !genesis {
-			accNum = signerAcc.GetAccountNumber()
-		}
 		signerData := authsigning.SignerData{
 			ChainID:       chainID,
-			AccountNumber: accNum,
+			AccountNumber: signerAcc.GetAccountNumber(),
 			Sequence:      signerAcc.GetSequence(),
 		}
 
@@ -468,9 +458,9 @@ func CheckSignatures(ctx sdk.Context, txConfig client.TxConfig, tx sdk.Tx, signe
 			if authante.OnlyLegacyAminoSigners(sig.Data) {
 				// If all signers are using SIGN_MODE_LEGACY_AMINO, we rely on VerifySignature to check account sequence number,
 				// and therefore communicate sequence number as a potential cause of error.
-				errMsg = fmt.Sprintf("signature verification failed; please verify account number (%d), sequence (%d) and chain-id (%s)", accNum, signerAcc.GetSequence(), chainID)
+				errMsg = fmt.Sprintf("signature verification failed; please verify account number (%d), sequence (%d) and chain-id (%s)", signerAcc.GetAccountNumber(), signerAcc.GetSequence(), chainID)
 			} else {
-				errMsg = fmt.Sprintf("signature verification failed; please verify account number (%d) and chain-id (%s)", accNum, chainID)
+				errMsg = fmt.Sprintf("signature verification failed; please verify account number (%d) and chain-id (%s)", signerAcc.GetAccountNumber(), chainID)
 			}
 			return nil, sdkerrors.Wrap(sdkerrors.ErrUnauthorized, errMsg)
 

app/antedecorators/gas.go

@@ -10,8 +10,8 @@ func GetGasMeterSetter(pk paramskeeper.Keeper) func(bool, sdk.Context, uint64, s
 	return func(simulate bool, ctx sdk.Context, gasLimit uint64, tx sdk.Tx) sdk.Context {
 		cosmosGasParams := pk.GetCosmosGasParams(ctx)
 
-		// In simulation, still use multiplier but with infinite gas limit
-		if simulate || ctx.BlockHeight() == 0 {
+		// In simulation and genesis delivery, still use multiplier but with infinite gas limit.
+		if simulate || ctx.IsGenesis() {
 			return ctx.WithGasMeter(types.NewInfiniteMultiplierGasMeter(cosmosGasParams.CosmosGasMultiplierNumerator, cosmosGasParams.CosmosGasMultiplierDenominator))
 		}
 

app/app.go

@@ -476,11 +476,6 @@ type App struct {
 
 	forkInitializer func(sdk.Context)
 
-	httpServerStartSignal     chan struct{}
-	wsServerStartSignal       chan struct{}
-	httpServerStartSignalSent bool
-	wsServerStartSignalSent   bool
-
 	// evmHTTPServer/evmWSServer hold the EVM JSON-RPC HTTP and WebSocket listeners
 	// constructed in RegisterLocalServices so an embedding orchestrator (the
 	// in-process harness) can Stop() them at teardown. Nil when the respective
@@ -539,21 +534,19 @@ func New(
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, banktypes.DeferredCacheStoreKey, oracletypes.MemStoreKey)
 
 	app := &App{
-		BaseApp:               bApp,
-		cdc:                   cdc,
-		appCodec:              appCodec,
-		interfaceRegistry:     interfaceRegistry,
-		keys:                  keys,
-		tkeys:                 tkeys,
-		memKeys:               memKeys,
-		txDecoder:             encodingConfig.TxConfig.TxDecoder(),
-		versionInfo:           version.NewInfo(),
-		metricCounter:         &map[string]float32{},
-		encodingConfig:        encodingConfig,
-		legacyEncodingConfig:  MakeLegacyEncodingConfig(),
-		stateStore:            stateStore,
-		httpServerStartSignal: make(chan struct{}, 1),
-		wsServerStartSignal:   make(chan struct{}, 1),
+		BaseApp:              bApp,
+		cdc:                  cdc,
+		appCodec:             appCodec,
+		interfaceRegistry:    interfaceRegistry,
+		keys:                 keys,
+		tkeys:                tkeys,
+		memKeys:              memKeys,
+		txDecoder:            encodingConfig.TxConfig.TxDecoder(),
+		versionInfo:          version.NewInfo(),
+		metricCounter:        &map[string]float32{},
+		encodingConfig:       encodingConfig,
+		legacyEncodingConfig: MakeLegacyEncodingConfig(),
+		stateStore:           stateStore,
 	}
 
 	for _, option := range appOptions {
@@ -1946,17 +1939,6 @@ func (app *App) ProcessBlock(ctx sdk.Context, txs [][]byte, req *BlockProcessReq
 		}
 	}()
 
-	defer func() {
-		if !app.httpServerStartSignalSent {
-			app.httpServerStartSignalSent = true
-			app.httpServerStartSignal <- struct{}{}
-		}
-		if !app.wsServerStartSignalSent {
-			app.wsServerStartSignalSent = true
-			app.wsServerStartSignal <- struct{}{}
-		}
-	}()
-
 	ctx = ctx.WithIsOCCEnabled(app.OccEnabled())
 
 	blockSpanCtx, blockSpan := app.GetBaseApp().TracingInfo.Start("Block")
@@ -2640,19 +2622,7 @@ func (app *App) LegacyAmino() *codec.LegacyAmino {
 }
 
 func (app *App) GetValidators() []abci.ValidatorUpdate {
-	// AUTOBAHN: After InitChain but before the first Commit, the committed
-	// store is empty — staking params don't exist, so reading from committed
-	// store panics in MaxValidators. Use DeliverContext when available at
-	// height 0, since it has the uncommitted staking state from InitChain.
-	// CometBFT consensus never hits this because its handshaker commits
-	// after InitChain before any block processing begins.
-	if app.LastBlockHeight() == 0 {
-		if dctx := app.DeliverContext(); dctx != nil {
-			return app.StakingKeeper.GetBondedValidators(*dctx)
-		}
-	}
-	ctx := app.NewUncachedContext(false, tmproto.Header{Height: max(app.LastBlockHeight(), 1)})
-	return app.StakingKeeper.GetBondedValidators(ctx)
+	return app.StakingKeeper.GetBondedValidators(app.GetCheckCtx())
 }
 
 // AppCodec returns an app codec.
@@ -2811,7 +2781,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
 		}
 		app.evmHTTPServer = evmHTTPServer
 		go func() {
-			<-app.httpServerStartSignal
+			<-app.Initialized()
 			if err := evmHTTPServer.Start(); err != nil {
 				panic(err)
 			}
@@ -2826,7 +2796,7 @@ func (app *App) RegisterLocalServices(node client.LocalClient, txConfig client.T
 		}
 		app.evmWSServer = evmWSServer
 		go func() {
-			<-app.wsServerStartSignal
+			<-app.Initialized()
 			if err := evmWSServer.Start(); err != nil {
 				panic(err)
 			}

app/eth_replay.go

@@ -35,7 +35,7 @@ func Replay(a *App) {
 		if err != nil {
 			panic(err)
 		}
-		_, err = a.InitChain(context.Background(), &abci.RequestInitChain{
+		_, err = a.InitChain(&abci.RequestInitChain{
 			Time:          time.Now(),
 			ChainId:       gendoc.ChainID,
 			AppStateBytes: gendoc.AppState,
@@ -119,7 +119,7 @@ func BlockTest(a *App, bt *ethtests.BlockTest) {
 	if err != nil {
 		panic(err)
 	}
-	_, err = a.InitChain(context.Background(), &abci.RequestInitChain{
+	_, err = a.InitChain(&abci.RequestInitChain{
 		Time:          time.Now(),
 		ChainId:       gendoc.ChainID,
 		AppStateBytes: gendoc.AppState,

app/test_helpers.go

@@ -397,12 +397,11 @@ func SetupWithAppOptsAndDefaultHome(isCheckTx bool, appOpts TestAppOpts, enableE
 		// TODO: remove once init chain works with SC
 		defer func() { _ = recover() }()
 
-		_, err = res.InitChain(
-			context.Background(), &abci.RequestInitChain{
-				ConsensusParams: DefaultConsensusParams,
-				ChainId:         "sei-test",
-				AppStateBytes:   stateBytes,
-			},
+		_, err = res.InitChain(&abci.RequestInitChain{
+			ConsensusParams: DefaultConsensusParams,
+			ChainId:         "sei-test",
+			AppStateBytes:   stateBytes,
+		},
 		)
 		if err != nil {
 			panic(err)
@@ -466,12 +465,11 @@ func SetupWithDB(tb testing.TB, db dbm.DB, isCheckTx bool, enableEVMCustomPrecom
 			panic(err)
 		}
 
-		_, err = res.InitChain(
-			context.Background(), &abci.RequestInitChain{
-				ConsensusParams: DefaultConsensusParams,
-				ChainId:         "sei-test",
-				AppStateBytes:   stateBytes,
-			},
+		_, err = res.InitChain(&abci.RequestInitChain{
+			ConsensusParams: DefaultConsensusParams,
+			ChainId:         "sei-test",
+			AppStateBytes:   stateBytes,
+		},
 		)
 		if err != nil {
 			panic(err)
@@ -514,12 +512,11 @@ func SetupWithScReceiptFromOpts(t *testing.T, isCheckTx bool, enableEVMCustomPre
 
 		defer func() { _ = recover() }()
 
-		_, err = res.InitChain(
-			context.Background(), &abci.RequestInitChain{
-				ConsensusParams: DefaultConsensusParams,
-				ChainId:         "sei-test",
-				AppStateBytes:   stateBytes,
-			},
+		_, err = res.InitChain(&abci.RequestInitChain{
+			ConsensusParams: DefaultConsensusParams,
+			ChainId:         "sei-test",
+			AppStateBytes:   stateBytes,
+		},
 		)
 		if err != nil {
 			panic(err)
@@ -570,11 +567,10 @@ func SetupWithSc(t *testing.T, isCheckTx bool, enableEVMCustomPrecompiles bool,
 		// TODO: remove once init chain works with SC
 		defer func() { _ = recover() }()
 
-		_, err = res.InitChain(
-			context.Background(), &abci.RequestInitChain{
-				ConsensusParams: DefaultConsensusParams,
-				AppStateBytes:   stateBytes,
-			},
+		_, err = res.InitChain(&abci.RequestInitChain{
+			ConsensusParams: DefaultConsensusParams,
+			AppStateBytes:   stateBytes,
+		},
 		)
 		if err != nil {
 			panic(err)
@@ -614,12 +610,11 @@ func SetupTestingAppWithLevelDb(t *testing.T, isCheckTx bool, enableEVMCustomPre
 			panic(err)
 		}
 
-		_, err = app.InitChain(
-			context.Background(), &abci.RequestInitChain{
-				ConsensusParams: DefaultConsensusParams,
-				ChainId:         "sei-test",
-				AppStateBytes:   stateBytes,
-			},
+		_, err = app.InitChain(&abci.RequestInitChain{
+			ConsensusParams: DefaultConsensusParams,
+			ChainId:         "sei-test",
+			AppStateBytes:   stateBytes,
+		},
 		)
 		if err != nil {
 			panic(err)
@@ -741,12 +736,11 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 	require.NoError(t, err)
 
 	// init chain will set the validator set and initialize the genesis accounts
-	_, _ = app.InitChain(
-		context.Background(), &abci.RequestInitChain{
-			ConsensusParams: DefaultConsensusParams,
-			ChainId:         "sei-test",
-			AppStateBytes:   stateBytes,
-		},
+	_, _ = app.InitChain(&abci.RequestInitChain{
+		ConsensusParams: DefaultConsensusParams,
+		ChainId:         "sei-test",
+		AppStateBytes:   stateBytes,
+	},
 	)
 
 	// commit genesis changes
@@ -783,12 +777,11 @@ func SetupWithGenesisAccounts(t *testing.T, genAccs []authtypes.GenesisAccount,
 		panic(err)
 	}
 
-	_, _ = app.InitChain(
-		context.Background(), &abci.RequestInitChain{
-			ConsensusParams: DefaultConsensusParams,
-			ChainId:         "sei-test",
-			AppStateBytes:   stateBytes,
-		},
+	_, _ = app.InitChain(&abci.RequestInitChain{
+		ConsensusParams: DefaultConsensusParams,
+		ChainId:         "sei-test",
+		AppStateBytes:   stateBytes,
+	},
 	)
 
 	_, _ = app.Commit(context.Background())