Merge branch 'main' into fix/txpool-filter

pactus-project · Nov 6, 2024 · 5ae87cb · 5ae87cb
2 parents 18f441f + 6cde2ef
commit 5ae87cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -455,11 +455,7 @@ func MakeConfig(workingDir string) (*config.Config, *genesis.Genesis, error) {
 	}
 
 	if !gen.ChainType().IsMainnet() {
-		crypto.AddressHRP = "tpc"
-		crypto.PublicKeyHRP = "tpublic"
-		crypto.PrivateKeyHRP = "tsecret"
-		crypto.XPublicKeyHRP = "txpublic"
-		crypto.XPrivateKeyHRP = "txsecret"
+		crypto.ToTestnetHRP()
 	}
 
 	walletsDir := PactusWalletDir(workingDir)

diff --git a/cmd/wallet/address.go b/cmd/wallet/address.go
@@ -140,6 +140,7 @@ func buildPrivateKeyCmd(parentCmd *cobra.Command) {
 		Short: "displays the private key for a specified address",
 		Args:  cobra.ExactArgs(1),
 	}
+
 	parentCmd.AddCommand(privateKeyCmd)
 
 	passOpt := addPasswordOption(privateKeyCmd)
@@ -166,6 +167,7 @@ func buildPublicKeyCmd(parentCmd *cobra.Command) {
 		Short: "displays the public key for a specified address",
 		Args:  cobra.ExactArgs(1),
 	}
+
 	parentCmd.AddCommand(publicKeyCmd)
 
 	publicKeyCmd.Run = func(_ *cobra.Command, args []string) {

diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -12,3 +12,12 @@ var (
 	// XPrivateKeyHRP is the Human Readable Part (HRP) for extended private key.
 	XPrivateKeyHRP = "xsecret"
 )
+
+// ToTestnetHRP makes HRPs testnet specified.
+func ToTestnetHRP() {
+	AddressHRP = "tpc"
+	PublicKeyHRP = "tpublic"
+	PrivateKeyHRP = "tsecret"
+	XPublicKeyHRP = "txpublic"
+	XPrivateKeyHRP = "txsecret"
+}
diff --git a/wallet/wallet.go b/wallet/wallet.go
@@ -134,11 +134,7 @@ func Create(walletPath, mnemonic, password string, chain genesis.ChainType,
 
 func newWallet(walletPath string, store *Store, offline bool, option *walletOpt) (*Wallet, error) {
 	if !store.Network.IsMainnet() {
-		crypto.AddressHRP = "tpc"
-		crypto.PublicKeyHRP = "tpublic"
-		crypto.PrivateKeyHRP = "tsecret"
-		crypto.XPublicKeyHRP = "txpublic"
-		crypto.XPrivateKeyHRP = "txsecret"
+		crypto.ToTestnetHRP()
 	}
 
 	client := newGrpcClient(option.timeout, option.servers)