Skip to content

Commit

Permalink
fix: rename extended key struct keys for clarity (#71)
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Gianelloni <wolf31o2@blinklabs.io>
  • Loading branch information
wolf31o2 authored Mar 6, 2024
1 parent 4417dfb commit ec0e360
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
36 changes: 18 additions & 18 deletions bursa.go
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
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

0 comments on commit ec0e360

Please sign in to comment.