refactor(zetaclient)!: remove hsm signer

zeta-chain · Nov 6, 2024 · 0081a4c · 0081a4c
1 parent a1fe36d
commit 0081a4c
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 3,881 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,6 @@ BUILD_FLAGS := -ldflags '$(ldflags)' -tags pebbledb,ledger
 
 TEST_DIR ?= "./..."
 TEST_BUILD_FLAGS := -tags pebbledb,ledger
-HSM_BUILD_FLAGS := -tags pebbledb,ledger,hsm_test
 
 export DOCKER_BUILDKIT := 1
 
@@ -73,9 +72,6 @@ test: clean-test-dir run-test
 run-test:
 	@go test ${TEST_BUILD_FLAGS} ${TEST_DIR}
 
-test-hsm:
-	@go test ${HSM_BUILD_FLAGS} ${TEST_DIR}
-
 # Generate the test coverage
 # "|| exit 1" is used to return a non-zero exit code if the tests fail
 test-coverage:

diff --git a/cmd/zetaclientd/debug.go b/cmd/zetaclientd/debug.go
@@ -73,7 +73,6 @@ func debugCmd(_ *cobra.Command, args []string) error {
 		debugArgs.zetaNode,
 		"",
 		debugArgs.zetaChainID,
-		false,
 		zerolog.Nop(),
 	)
 	if err != nil {

diff --git a/cmd/zetaclientd/hsm.go b/cmd/zetaclientd/hsm.go
diff --git a/cmd/zetaclientd/init.go b/cmd/zetaclientd/init.go
@@ -34,8 +34,6 @@ type initArguments struct {
 	TssPath             string
 	TestTssKeysign      bool
 	KeyringBackend      string
-	HsmMode             bool
-	HsmHotKey           string
 	RelayerKeyPath      string
 }
 
@@ -67,9 +65,6 @@ func init() {
 		BoolVar(&initArgs.TestTssKeysign, "test-tss", false, "set to to true to run a check for TSS keysign on startup")
 	InitCmd.Flags().
 		StringVar(&initArgs.KeyringBackend, "keyring-backend", string(config.KeyringBackendTest), "keyring backend to use (test, file)")
-	InitCmd.Flags().BoolVar(&initArgs.HsmMode, "hsm-mode", false, "enable hsm signer, default disabled")
-	InitCmd.Flags().
-		StringVar(&initArgs.HsmHotKey, "hsm-hotkey", "hsm-hotkey", "name of hotkey associated with hardware security module")
 	InitCmd.Flags().
 		StringVar(&initArgs.RelayerKeyPath, "relayer-key-path", "~/.zetacored/relayer-keys", "path to relayer keys")
 }
@@ -107,8 +102,6 @@ func Initialize(_ *cobra.Command, _ []string) error {
 	configData.P2PDiagnosticTicker = initArgs.p2pDiagnosticTicker
 	configData.ConfigUpdateTicker = initArgs.configUpdateTicker
 	configData.KeyringBackend = config.KeyringBackend(initArgs.KeyringBackend)
-	configData.HsmMode = initArgs.HsmMode
-	configData.HsmHotKey = initArgs.HsmHotKey
 	configData.RelayerKeyPath = initArgs.RelayerKeyPath
 	configData.ComplianceConfig = sample.ComplianceConfig()
 

diff --git a/cmd/zetaclientd/utils.go b/cmd/zetaclientd/utils.go
@@ -16,9 +16,6 @@ func CreateAuthzSigner(granter string, grantee sdk.AccAddress) {
 
 func CreateZetacoreClient(cfg config.Config, hotkeyPassword string, logger zerolog.Logger) (*zetacore.Client, error) {
 	hotKey := cfg.AuthzHotkey
-	if cfg.HsmMode {
-		hotKey = cfg.HsmHotKey
-	}
 
 	chainIP := cfg.ZetaCoreURL
 
@@ -34,7 +31,7 @@ func CreateZetacoreClient(cfg config.Config, hotkeyPassword string, logger zerol
 
 	k := keys.NewKeysWithKeybase(kb, granterAddreess, cfg.AuthzHotkey, hotkeyPassword)
 
-	client, err := zetacore.NewClient(k, chainIP, hotKey, cfg.ChainID, cfg.HsmMode, logger)
+	client, err := zetacore.NewClient(k, chainIP, hotKey, cfg.ChainID, logger)
 	if err != nil {
 		return nil, err
 	}

diff --git a/go.mod b/go.mod
@@ -26,7 +26,6 @@ require (
 	github.com/emicklei/proto v1.11.1
 	github.com/ethereum/go-ethereum v1.13.15
 	github.com/fatih/color v1.14.1
-	github.com/frumioj/crypto11 v1.2.5-0.20210823151709-946ce662cc0e
 	github.com/gagliardetto/solana-go v1.10.0
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.4
@@ -57,7 +56,6 @@ require (
 	github.com/spf13/viper v1.18.2
 	github.com/stretchr/testify v1.9.0
 	github.com/zeta-chain/ethermint v0.0.0-20241105191054-1ebf85a354a0
-	github.com/zeta-chain/keystone/keys v0.0.0-20240826165841-3874f358c138
 	github.com/zeta-chain/protocol-contracts v1.0.2-athens3.0.20241021075719-d40d2e28467c
 	gitlab.com/thorchain/tss/go-tss v1.6.5
 	go.nhat.io/grpcmock v0.25.0
@@ -220,7 +218,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/dns v1.1.54 // indirect
-	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
 	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
@@ -271,7 +268,6 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tendermint/btcd v0.1.1 // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
-	github.com/thales-e-security/pool v0.0.2 // indirect
 	github.com/tidwall/btree v1.6.0 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
@@ -337,12 +333,15 @@ require (
 	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
 	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
 	github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
+	github.com/gobwas/ws v1.1.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
+	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20220328075252-7dd334e3daae // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
+	github.com/otiai10/mint v1.3.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect