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

Jump to bottom

fix: rename extended key struct keys for clarity #71

Merged
merged 1 commit into from
Mar 6, 2024
Merged

fix: rename extended key struct keys for clarity #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions bursa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ type KeyFile struct {
}

type Wallet struct {
Mnemonic string `json:"mnemonic"`
PaymentAddress string `json:"payment_address"`
StakeAddress string `json:"stake_address"`
PaymentVKey KeyFile `json:"payment_kvey"`
PaymentSKey KeyFile `json:"payment_skey"`
PaymentESKey KeyFile `json:"payment_extended_skey"`
StakeVKey KeyFile `json:"stake_vkey"`
StakeSKey KeyFile `json:"stake_skey"`
StakeESKey KeyFile `json:"stake_extended_skey"`
Mnemonic string `json:"mnemonic"`
PaymentAddress string `json:"payment_address"`
StakeAddress string `json:"stake_address"`
PaymentVKey KeyFile `json:"payment_kvey"`
PaymentSKey KeyFile `json:"payment_skey"`
PaymentExtendedSKey KeyFile `json:"payment_extended_skey"`
StakeVKey KeyFile `json:"stake_vkey"`
StakeSKey KeyFile `json:"stake_skey"`
StakeExtendedSKey KeyFile `json:"stake_extended_skey"`
}

func NewWallet(
Expand All @@ -60,15 +60,15 @@ func NewWallet(
stakeKey := GetStakeKey(accountKey, stakeId)
addr := GetAddress(accountKey, network, addressId)
w := &Wallet{
Mnemonic: mnemonic,
PaymentAddress: addr.String(),
StakeAddress: addr.ToReward().String(),
PaymentVKey: GetPaymentVKey(paymentKey),
PaymentSKey: GetPaymentSKey(paymentKey),
PaymentESKey: GetPaymentExtendedSKey(paymentKey),
StakeVKey: GetStakeVKey(stakeKey),
StakeSKey: GetStakeSKey(stakeKey),
StakeESKey: GetStakeExtendedSKey(stakeKey),
Mnemonic: mnemonic,
PaymentAddress: addr.String(),
StakeAddress: addr.ToReward().String(),
PaymentVKey: GetPaymentVKey(paymentKey),
PaymentSKey: GetPaymentSKey(paymentKey),
PaymentExtendedSKey: GetPaymentExtendedSKey(paymentKey),
StakeVKey: GetStakeVKey(stakeKey),
StakeSKey: GetStakeSKey(stakeKey),
StakeExtendedSKey: GetStakeExtendedSKey(stakeKey),
}
return w, nil
}
Expand Down
8 changes: 4 additions & 4 deletions internal/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ func Run() {

fmt.Printf("payment.vkey=%s\n", bursa.GetKeyFile(w.PaymentVKey))
fmt.Printf("payment.skey=%s\n", bursa.GetKeyFile(w.PaymentSKey))
fmt.Printf("paymentExtended.skey=%s\n", bursa.GetKeyFile(w.PaymentESKey))
fmt.Printf("paymentExtended.skey=%s\n", bursa.GetKeyFile(w.PaymentExtendedSKey))
fmt.Printf("stake.vkey=%s\n", bursa.GetKeyFile(w.StakeVKey))
fmt.Printf("stake.skey=%s\n", bursa.GetKeyFile(w.StakeSKey))
fmt.Printf("stakeExtended.skey=%s\n", bursa.GetKeyFile(w.StakeESKey))
fmt.Printf("stakeExtended.skey=%s\n", bursa.GetKeyFile(w.StakeExtendedSKey))
} else {
fmt.Printf("Output dir: %v\n", *flagOutput)
_, err := os.Stat(*flagOutput)
Expand All @@ -82,10 +82,10 @@ func Run() {
{"stake.addr": w.StakeAddress},
{"payment.vkey": bursa.GetKeyFile(w.PaymentVKey)},
{"payment.skey": bursa.GetKeyFile(w.PaymentSKey)},
{"paymentExtended.skey": bursa.GetKeyFile(w.PaymentESKey)},
{"paymentExtended.skey": bursa.GetKeyFile(w.PaymentExtendedSKey)},
{"stake.vkey": bursa.GetKeyFile(w.StakeVKey)},
{"stake.skey": bursa.GetKeyFile(w.StakeSKey)},
{"stakeExtended.skey": bursa.GetKeyFile(w.StakeESKey)},
{"stakeExtended.skey": bursa.GetKeyFile(w.StakeExtendedSKey)},
}
var g errgroup.Group
for _, m := range fileMap {
Expand Down