11package app
22
33import (
4- "crypto/sha256"
5- "encoding/hex"
64 stderrors "errors"
75 "fmt"
86 "io"
@@ -11,10 +9,10 @@ import (
119 "net/http"
1210 "os"
1311 "path/filepath"
14- "sort"
1512
1613 autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
1714 reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
15+ "filippo.io/age"
1816 runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
1917 "golang.org/x/exp/slices"
2018
@@ -23,6 +21,7 @@ import (
2321 tmjson "github.com/cometbft/cometbft/libs/json"
2422 "github.com/cometbft/cometbft/libs/log"
2523 tmos "github.com/cometbft/cometbft/libs/os"
24+ tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
2625 "github.com/cosmos/cosmos-sdk/client"
2726 "github.com/cosmos/cosmos-sdk/codec/types"
2827 "github.com/gorilla/mux"
@@ -123,6 +122,7 @@ import (
123122 icaauthkeeper "github.com/crypto-org-chain/cronos/v2/x/icaauth/keeper"
124123 icaauthtypes "github.com/crypto-org-chain/cronos/v2/x/icaauth/types"
125124
125+ clientflags "github.com/cosmos/cosmos-sdk/client/flags"
126126 evmante "github.com/evmos/ethermint/app/ante"
127127 srvflags "github.com/evmos/ethermint/server/flags"
128128 ethermint "github.com/evmos/ethermint/types"
@@ -159,6 +159,11 @@ import (
159159 _ "github.com/ethereum/go-ethereum/eth/tracers/native"
160160 ethparams "github.com/ethereum/go-ethereum/params"
161161
162+ e2ee "github.com/crypto-org-chain/cronos/v2/x/e2ee"
163+ e2eekeeper "github.com/crypto-org-chain/cronos/v2/x/e2ee/keeper"
164+ e2eekeyring "github.com/crypto-org-chain/cronos/v2/x/e2ee/keyring"
165+ e2eetypes "github.com/crypto-org-chain/cronos/v2/x/e2ee/types"
166+
162167 // force register the extension json-rpc.
163168 _ "github.com/crypto-org-chain/cronos/v2/x/cronos/rpc"
164169)
@@ -170,8 +175,6 @@ const (
170175 //
171176 // NOTE: In the SDK, the default value is 255.
172177 AddrLen = 20
173-
174- FlagBlockedAddresses = "blocked-addresses"
175178)
176179
177180var Forks = []Fork {}
@@ -260,6 +263,7 @@ func GenModuleBasics() module.BasicManager {
260263 ibcfee.AppModuleBasic {},
261264 evm.AppModuleBasic {},
262265 feemarket.AppModuleBasic {},
266+ e2ee.AppModuleBasic {},
263267 // this line is used by starport scaffolding # stargate/app/moduleBasic
264268 gravity.AppModuleBasic {},
265269 cronos.AppModuleBasic {},
@@ -286,6 +290,8 @@ func StoreKeys(skipGravity bool) (
286290 icaauthtypes .StoreKey ,
287291 // ethermint keys
288292 evmtypes .StoreKey , feemarkettypes .StoreKey ,
293+ // e2ee keys
294+ e2eetypes .StoreKey ,
289295 // this line is used by starport scaffolding # stargate/app/storeKey
290296 cronostypes .StoreKey ,
291297 }
@@ -357,6 +363,9 @@ type App struct {
357363 // Gravity module
358364 GravityKeeper gravitykeeper.Keeper
359365
366+ // e2ee keeper
367+ E2EEKeeper e2eekeeper.Keeper
368+
360369 // this line is used by starport scaffolding # stargate/app/keeperDeclaration
361370
362371 CronosKeeper cronoskeeper.Keeper
@@ -371,6 +380,8 @@ type App struct {
371380 configurator module.Configurator
372381
373382 qms storetypes.MultiStore
383+
384+ blockProposalHandler * ProposalHandler
374385}
375386
376387// New returns a reference to an initialized chain.
@@ -385,15 +396,37 @@ func New(
385396 cdc := encodingConfig .Amino
386397 interfaceRegistry := encodingConfig .InterfaceRegistry
387398
399+ var identity age.Identity
400+ {
401+ if cast .ToString (appOpts .Get ("mode" )) == "validator" {
402+ krBackend := cast .ToString (appOpts .Get (clientflags .FlagKeyringBackend ))
403+ kr , err := e2eekeyring .New ("cronosd" , krBackend , homePath , os .Stdin )
404+ if err != nil {
405+ panic (err )
406+ }
407+ bz , err := kr .Get (e2eetypes .DefaultKeyringName )
408+ if err != nil {
409+ logger .Error ("e2ee identity for validator not found" , "error" , err )
410+ } else {
411+ identity , err = age .ParseX25519Identity (string (bz ))
412+ if err != nil {
413+ panic (err )
414+ }
415+ }
416+ }
417+ }
418+
388419 baseAppOptions = memiavlstore .SetupMemIAVL (logger , homePath , appOpts , false , false , baseAppOptions )
420+
421+ blockProposalHandler := NewProposalHandler (encodingConfig .TxConfig .TxDecoder (), identity )
422+
389423 // NOTE we use custom transaction decoder that supports the sdk.Tx interface instead of sdk.StdTx
390424 // Setup Mempool and Proposal Handlers
391425 baseAppOptions = append (baseAppOptions , func (app * baseapp.BaseApp ) {
392426 mempool := mempool.NoOpMempool {}
393427 app .SetMempool (mempool )
394- handler := baseapp .NewDefaultProposalHandler (mempool , app )
395- app .SetPrepareProposal (handler .PrepareProposalHandler ())
396- app .SetProcessProposal (handler .ProcessProposalHandler ())
428+ app .SetPrepareProposal (blockProposalHandler .PrepareProposalHandler ())
429+ app .SetProcessProposal (blockProposalHandler .ProcessProposalHandler ())
397430 })
398431 bApp := baseapp .NewBaseApp (Name , logger , db , encodingConfig .TxConfig .TxDecoder (), baseAppOptions ... )
399432
@@ -404,14 +437,15 @@ func New(
404437 keys , memKeys , tkeys := StoreKeys (skipGravity )
405438
406439 app := & App {
407- BaseApp : bApp ,
408- cdc : cdc ,
409- appCodec : appCodec ,
410- interfaceRegistry : interfaceRegistry ,
411- invCheckPeriod : invCheckPeriod ,
412- keys : keys ,
413- tkeys : tkeys ,
414- memKeys : memKeys ,
440+ BaseApp : bApp ,
441+ cdc : cdc ,
442+ appCodec : appCodec ,
443+ interfaceRegistry : interfaceRegistry ,
444+ invCheckPeriod : invCheckPeriod ,
445+ keys : keys ,
446+ tkeys : tkeys ,
447+ memKeys : memKeys ,
448+ blockProposalHandler : blockProposalHandler ,
415449 }
416450
417451 // init params keeper and subspaces
@@ -666,6 +700,8 @@ func New(
666700 // this line is used by starport scaffolding # ibc/app/router
667701 app .IBCKeeper .SetRouter (ibcRouter )
668702
703+ app .E2EEKeeper = e2eekeeper .NewKeeper (keys [e2eetypes .StoreKey ])
704+
669705 /**** Module Options ****/
670706
671707 // NOTE: we may consider parsing `appOpts` inside module constructors. For the moment
@@ -709,6 +745,9 @@ func New(
709745 feeModule ,
710746 feemarket .NewAppModule (app .FeeMarketKeeper , feeMarketS ),
711747 evm .NewAppModule (app .EvmKeeper , app .AccountKeeper , evmS ),
748+ e2ee .NewAppModule (app .E2EEKeeper ),
749+
750+ // Cronos app modules
712751 cronosModule ,
713752 }
714753
@@ -737,6 +776,7 @@ func New(
737776 vestingtypes .ModuleName ,
738777 cronostypes .ModuleName ,
739778 consensusparamtypes .ModuleName ,
779+ e2eetypes .ModuleName ,
740780 }
741781 endBlockersOrder := []string {
742782 crisistypes .ModuleName , govtypes .ModuleName , stakingtypes .ModuleName ,
@@ -760,6 +800,7 @@ func New(
760800 vestingtypes .ModuleName ,
761801 cronostypes .ModuleName ,
762802 consensusparamtypes .ModuleName ,
803+ e2eetypes .ModuleName ,
763804 }
764805 // NOTE: The genutils module must occur after staking so that pools are
765806 // properly initialized with tokens from genesis accounts.
@@ -795,6 +836,7 @@ func New(
795836 consensusparamtypes .ModuleName ,
796837 // NOTE: crisis module must go at the end to check for invariants on each module
797838 crisistypes .ModuleName ,
839+ e2eetypes .ModuleName ,
798840 }
799841
800842 if ! skipGravity {
@@ -876,7 +918,6 @@ func New(
876918 app .SetEndBlocker (app .EndBlocker )
877919 if err := app .setAnteHandler (encodingConfig .TxConfig ,
878920 cast .ToUint64 (appOpts .Get (srvflags .EVMMaxTxGasWanted )),
879- cast .ToStringSlice (appOpts .Get (FlagBlockedAddresses )),
880921 ); err != nil {
881922 panic (err )
882923 }
@@ -908,6 +949,10 @@ func New(
908949 tmos .Exit (fmt .Sprintf ("versiondb version %d lag behind iavl version %d" , v1 , v2 ))
909950 }
910951 }
952+
953+ if err := app .RefreshBlockList (app .NewUncachedContext (false , tmproto.Header {})); err != nil {
954+ panic (err )
955+ }
911956 }
912957
913958 app .ScopedIBCKeeper = scopedIBCKeeper
@@ -920,34 +965,7 @@ func New(
920965}
921966
922967// use Ethermint's custom AnteHandler
923- func (app * App ) setAnteHandler (txConfig client.TxConfig , maxGasWanted uint64 , blacklist []string ) error {
924- if len (blacklist ) > 0 {
925- sort .Strings (blacklist )
926- // hash blacklist concatenated
927- h := sha256 .New ()
928- for _ , addr := range blacklist {
929- _ , err := h .Write ([]byte (addr ))
930- if err != nil {
931- panic (err )
932- }
933- }
934- app .Logger ().Error ("Setting ante handler with blacklist" , "size" , len (blacklist ), "hash" , hex .EncodeToString (h .Sum (nil )))
935- for _ , addr := range blacklist {
936- app .Logger ().Error ("Blacklisted address" , "address" , addr )
937- }
938- } else {
939- app .Logger ().Error ("Setting ante handler without blacklist" )
940- }
941- blockedMap := make (map [string ]struct {}, len (blacklist ))
942- for _ , str := range blacklist {
943- addr , err := sdk .AccAddressFromBech32 (str )
944- if err != nil {
945- return fmt .Errorf ("invalid bech32 address: %s, err: %w" , str , err )
946- }
947-
948- blockedMap [string (addr )] = struct {}{}
949- }
950- blockAddressDecorator := NewBlockAddressesDecorator (blockedMap )
968+ func (app * App ) setAnteHandler (txConfig client.TxConfig , maxGasWanted uint64 ) error {
951969 options := evmante.HandlerOptions {
952970 AccountKeeper : app .AccountKeeper ,
953971 BankKeeper : app .BankKeeper ,
@@ -964,7 +982,6 @@ func (app *App) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint64, bl
964982 sdk .MsgTypeURL (& evmtypes.MsgEthereumTx {}),
965983 sdk .MsgTypeURL (& vestingtypes.MsgCreateVestingAccount {}),
966984 },
967- ExtraDecorators : []sdk.AnteDecorator {blockAddressDecorator },
968985 }
969986
970987 anteHandler , err := evmante .NewAnteHandler (options )
@@ -1002,7 +1019,22 @@ func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.R
10021019
10031020// EndBlocker application updates every end block
10041021func (app * App ) EndBlocker (ctx sdk.Context , req abci.RequestEndBlock ) abci.ResponseEndBlock {
1005- return app .mm .EndBlock (ctx , req )
1022+ rsp := app .mm .EndBlock (ctx , req )
1023+
1024+ if err := app .RefreshBlockList (ctx ); err != nil {
1025+ app .Logger ().Error ("failed to update blocklist" , "error" , err )
1026+ }
1027+
1028+ return rsp
1029+ }
1030+
1031+ func (app * App ) RefreshBlockList (ctx sdk.Context ) error {
1032+ if app .blockProposalHandler == nil || app .blockProposalHandler .Identity == nil {
1033+ return nil
1034+ }
1035+
1036+ // refresh blocklist
1037+ return app .blockProposalHandler .SetBlockList (app .CronosKeeper .GetBlockList (ctx ))
10061038}
10071039
10081040// InitChainer application update at chain initialization
0 commit comments