Merge pull request #31 from initia-labs/feat/remove-eth-pubkey

feat: remove eth pubkey
initia-labs · Dec 8, 2023 · 5f92ad1 · 5f92ad1
2 parents 3eea7c8 + cfbd073
commit 5f92ad1
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 1,387 deletions.
diff --git a/app/ante/ante.go b/app/ante/ante.go
@@ -49,7 +49,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 
 	sigGasConsumer := options.SigGasConsumer
 	if sigGasConsumer == nil {
-		sigGasConsumer = DefaultSigVerificationGasConsumer
+		sigGasConsumer = ante.DefaultSigVerificationGasConsumer
 	}
 
 	txFeeChecker := options.TxFeeChecker

diff --git a/app/ante/sigverify.go b/app/ante/sigverify.go
diff --git a/app/encoding.go b/app/encoding.go
@@ -5,7 +5,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/std"
 
 	"github.com/initia-labs/initia/app/params"
-	cryptocodec "github.com/initia-labs/initia/crypto/codec"
 )
 
 var legacyCodecRegistered = false
@@ -15,16 +14,13 @@ func MakeEncodingConfig() params.EncodingConfig {
 	encodingConfig := params.MakeEncodingConfig()
 	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	cryptocodec.RegisterCrypto(encodingConfig.Amino)
-	cryptocodec.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
 	if !legacyCodecRegistered {
 		// authz module use this codec to get signbytes.
 		// authz MsgExec can execute all message types,
 		// so legacy.Cdc need to register all amino messages to get proper signature
-		cryptocodec.RegisterCrypto(legacy.Cdc)
 		ModuleBasics.RegisterLegacyAminoCodec(legacy.Cdc)
 		legacyCodecRegistered = true
 	}

diff --git a/cmd/initiad/root.go b/cmd/initiad/root.go
@@ -20,7 +20,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cosmos/cosmos-sdk/client/rpc"
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -32,14 +31,10 @@ import (
 
 	initiaapp "github.com/initia-labs/initia/app"
 	"github.com/initia-labs/initia/app/params"
-	initiahd "github.com/initia-labs/initia/crypto/hd"
 	genutilcli "github.com/initia-labs/initia/x/genutil/client/cli"
 	moveconfig "github.com/initia-labs/initia/x/move/config"
 )
 
-// missing flag from cosmos-sdk
-const flagIAVLCacheSize = "iavl-cache-size"
-
 // NewRootCmd creates a new root command for initiad. It is called once in the
 // main function.
 func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
@@ -79,10 +74,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
 		WithInput(os.Stdin).
 		WithAccountRetriever(types.AccountRetriever{}).
 		WithHomeDir(initiaapp.DefaultNodeHome).
-		WithViper(initiaapp.EnvPrefix).
-		WithKeyringOptions(func(options *keyring.Options) {
-			options.SupportedAlgos = append(options.SupportedAlgos, initiahd.EthSecp256k1)
-		})
+		WithViper(initiaapp.EnvPrefix)
 
 	rootCmd := &cobra.Command{
 		Use:   basename,

diff --git a/crypto/codec/amino.go b/crypto/codec/amino.go
diff --git a/crypto/codec/proto.go b/crypto/codec/proto.go
diff --git a/crypto/hd/algo.go b/crypto/hd/algo.go
diff --git a/crypto/keys/eth/secp256k1/hash.go b/crypto/keys/eth/secp256k1/hash.go