Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add coin-type and key-type when generate key #157

Merged
merged 5 commits into from
Mar 12, 2025
+16 −9
Merged

feat: add coin-type and key-type when generate key #157

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a018fc
feat: add coin-type and key-type when generate key
Benzbeeb Mar 11, 2025
172b4ad
fix: recover celestia binary
Benzbeeb Mar 11, 2025
5a0d636
fix: app name
Benzbeeb Mar 11, 2025
b36d41c
feat: opinit-bots
Benzbeeb Mar 11, 2025
a855f37
Merge branch 'main' into feat/add-coin-type
Benzbeeb Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions cosmosutils/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@ func UnmarshalKeyInfo(rawJson string) (KeyInfo, error) {

// AddOrReplace adds or replaces a key using `initiad keys add <keyname> --keyring-backend test` with 'y' confirmation
func AddOrReplace(appName, keyname string) (string, error) {
// Command to add the key: echo 'y' | initiad keys add <keyname> --keyring-backend test
cmd := exec.Command(appName, "keys", "add", keyname, "--keyring-backend", "test", "--output", "json")

var cmd *exec.Cmd
if strings.HasSuffix(appName, "celestia-appd") {
cmd = exec.Command(appName, "keys", "add", keyname, "--keyring-backend", "test", "--output", "json")
} else {
cmd = exec.Command(appName, "keys", "add", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--keyring-backend", "test", "--output", "json")
}
// Simulate pressing 'y' for confirmation
cmd.Stdin = bytes.NewBufferString("y\n")

Expand Down Expand Up @@ -78,8 +81,12 @@ func RecoverKeyFromMnemonic(appName, keyname, mnemonic string) (string, error) {
// Add the mnemonic input after the confirmation (if any)
inputBuffer.WriteString(mnemonic + "\n")

// Command to recover (or replace) the key: initiad keys add <keyname> --recover --keyring-backend test
cmd := exec.Command(appName, "keys", "add", keyname, "--recover", "--keyring-backend", "test", "--output", "json")
var cmd *exec.Cmd
if strings.HasSuffix(appName, "celestia-appd") {
cmd = exec.Command(appName, "keys", "add", keyname, "--recover", "--keyring-backend", "test", "--output", "json")
} else {
cmd = exec.Command(appName, "keys", "add", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--recover", "--keyring-backend", "test", "--output", "json")
}

// Pass the combined confirmation and mnemonic as input to the command
cmd.Stdin = &inputBuffer
Expand Down Expand Up @@ -148,9 +155,9 @@ func OPInitRecoverKeyFromMnemonic(appName, keyname, mnemonic string, isCelestia
// Add the mnemonic input after the confirmation (if any)
inputBuffer.WriteString(mnemonic + "\n")
if isCelestia {
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--recover", "--bech32", "celestia", "--home", opInitHome)
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--recover", "--bech32", "celestia", "--home", opInitHome)
} else {
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--recover", "--home", opInitHome)
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--recover", "--home", opInitHome)
}
// Pass the combined confirmation and mnemonic as input to the command
cmd.Stdin = &inputBuffer
Expand Down Expand Up @@ -241,9 +248,9 @@ func OPInitAddOrReplace(appName, keyname string, isCelestia bool, opInitHome str
var cmd *exec.Cmd

if isCelestia {
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--bech32", "celestia", "--home", opInitHome)
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--bech32", "celestia", "--home", opInitHome)
} else {
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--home", opInitHome)
cmd = exec.Command(appName, "keys", "add", "weave-dummy", keyname, "--coin-type", "118", "--key-type", "secp256k1", "--home", opInitHome)

}
// Simulate pressing 'y' for confirmation
Expand Down