enable ethpubkey (#68)

initia-labs · Oct 28, 2024 · b86632d · b86632d
1 parent c3868ba
commit b86632d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/ante/ante.go b/app/ante/ante.go
@@ -13,6 +13,7 @@ import (
 	opchildante "github.com/initia-labs/OPinit/x/opchild/ante"
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
 	accnumante "github.com/initia-labs/initia/app/ante/accnum"
+	"github.com/initia-labs/initia/app/ante/sigverify"
 	moveante "github.com/initia-labs/initia/x/move/ante"
 
 	"github.com/skip-mev/block-sdk/v2/block"
@@ -88,7 +89,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		ante.NewSetPubKeyDecorator(options.AccountKeeper),
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
-		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		sigverify.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCkeeper),
 		auctionante.NewAuctionDecorator(options.AuctionKeeper, options.TxEncoder, options.MevLane),

diff --git a/cmd/minitiad/root.go b/cmd/minitiad/root.go
@@ -33,10 +33,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 
+	"github.com/initia-labs/initia/app/params"
 	movecmd "github.com/initia-labs/initia/cmd/move"
+	cryptokeyring "github.com/initia-labs/initia/crypto/keyring"
 	moveconfig "github.com/initia-labs/initia/x/move/config"
 
-	"github.com/initia-labs/initia/app/params"
 	minitiaapp "github.com/initia-labs/minimove/app"
 
 	opchildcli "github.com/initia-labs/OPinit/x/opchild/client/cli"
@@ -87,7 +88,8 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 		WithInput(os.Stdin).
 		WithAccountRetriever(types.AccountRetriever{}).
 		WithHomeDir(minitiaapp.DefaultNodeHome).
-		WithViper(minitiaapp.EnvPrefix)
+		WithViper(minitiaapp.EnvPrefix).
+		WithKeyringOptions(cryptokeyring.Option())
 
 	rootCmd := &cobra.Command{
 		Use:   basename,