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

feat(wallet): adding all account address functions #1128

Merged
merged 5 commits into from
Feb 21, 2024
Merged

feat(wallet): adding all account address functions #1128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5778995
feat(wallet): adding all amount and all account address functions
kehiy Feb 18, 2024
423bf8c
feat: change requests
kehiy Feb 20, 2024
acad962
Merge branch 'main' into feature/txs
kehiy Feb 20, 2024
d009a7b
feat: change requests
kehiy Feb 20, 2024
f936626
Merge branch 'main' into feature/txs
kehiy Feb 20, 2024
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
2 changes: 1 addition & 1 deletion cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
}
} else {
for i := 0; i < len(valAddrsInfo); i++ {
valAddrPath, _ := addresspath.NewPathFromString(valAddrsInfo[i].Path)
valAddrPath, _ := addresspath.FromString(valAddrsInfo[i].Path)

Check warning on line 436 in cmd/cmd.go

View check run for this annotation

Codecov / codecov/patch

cmd/cmd.go#L436 

Added line #L436 was not covered by tests
accAddrPath := addresspath.NewPath(
valAddrPath.Purpose(),
valAddrPath.CoinType(),
Expand Down
3 changes: 1 addition & 2 deletions cmd/gtk/dialog_transaction_bond.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ func broadcastTransactionBond(wlt *wallet.Wallet) {
getButtonObj(builder, "id_button_cancel").SetImage(CancelIcon())
getButtonObj(builder, "id_button_send").SetImage(SendIcon())

// TODO: we need something like: wlt.AllAccountAddresses()
for _, ai := range wlt.AddressInfos() {
for _, ai := range wlt.AllAccountAddresses() {
senderEntry.Append(ai.Address, ai.Address)
}

Expand Down
3 changes: 1 addition & 2 deletions cmd/gtk/dialog_transaction_transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ func broadcastTransactionTransfer(wlt *wallet.Wallet) {
getButtonObj(builder, "id_button_cancel").SetImage(CancelIcon())
getButtonObj(builder, "id_button_send").SetImage(SendIcon())

// TODO: we need something like: wlt.AllAccountAddresses()
for _, i := range wlt.AddressInfos() {
for _, i := range wlt.AllAccountAddresses() {
senderEntry.Append(i.Address, i.Address)
}
senderEntry.SetActive(0)
Expand Down
2 changes: 1 addition & 1 deletion wallet/addresspath/path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func NewPath(indexes ...uint32) Path {
}

// TODO: check the path should exactly 4 levels.
func NewPathFromString(str string) (Path, error) {
func FromString(str string) (Path, error) {
sub := strings.Split(str, "/")
if sub[0] != "m" {
return nil, ErrInvalidPath
Expand Down
2 changes: 1 addition & 1 deletion wallet/addresspath/path_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestStringToPath(t *testing.T) {
{"m/abc'", nil, strconv.ErrSyntax},
}
for i, test := range tests {
path, err := NewPathFromString(test.str)
path, err := FromString(test.str)
assert.Equal(t, path, test.wantPath, "case %d failed", i)
assert.ErrorIsf(t, err, test.wantErr, "case %d failed", i)
}
Expand Down
37 changes: 26 additions & 11 deletions wallet/vault/vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func (v *Vault) AddressInfos() []AddressInfo {
func (v *Vault) AllValidatorAddresses() []AddressInfo {
addrs := make([]AddressInfo, 0, v.AddressCount()/2)
for _, addrInfo := range v.Addresses {
addrPath, _ := addresspath.NewPathFromString(addrInfo.Path)
addrPath, _ := addresspath.FromString(addrInfo.Path)
if addrPath.AddressType() == H(crypto.AddressTypeValidator) {
addrs = append(addrs, addrInfo)
}
Expand All @@ -232,10 +232,25 @@ func (v *Vault) AllValidatorAddresses() []AddressInfo {
return addrs
}

func (v *Vault) AllAccountAddresses() []AddressInfo {
addrs := make([]AddressInfo, 0, v.AddressCount()/2)
for _, addrInfo := range v.Addresses {
addrPath, _ := addresspath.FromString(addrInfo.Path)
if addrPath.AddressType() != H(crypto.AddressTypeValidator) {
addrs = append(addrs, addrInfo)
}
}

v.SortAddressesByAddressIndex(addrs...)
v.SortAddressesByPurpose(addrs...)

return addrs
}

func (v *Vault) AllImportedPrivateKeysAddresses() []AddressInfo {
addrs := make([]AddressInfo, 0, v.AddressCount()/2)
for _, addrInfo := range v.Addresses {
addrPath, _ := addresspath.NewPathFromString(addrInfo.Path)
addrPath, _ := addresspath.FromString(addrInfo.Path)
if addrPath.Purpose() == H(PurposeImportPrivateKey) {
addrs = append(addrs, addrInfo)
}
Expand All @@ -249,26 +264,26 @@ func (v *Vault) AllImportedPrivateKeysAddresses() []AddressInfo {

func (v *Vault) SortAddressesByPurpose(addrs ...AddressInfo) {
slices.SortStableFunc(addrs, func(a, b AddressInfo) int {
pathA, _ := addresspath.NewPathFromString(a.Path)
pathB, _ := addresspath.NewPathFromString(b.Path)
pathA, _ := addresspath.FromString(a.Path)
pathB, _ := addresspath.FromString(b.Path)

return cmp.Compare(pathA.Purpose(), pathB.Purpose())
})
}

func (v *Vault) SortAddressesByAddressType(addrs ...AddressInfo) {
slices.SortStableFunc(addrs, func(a, b AddressInfo) int {
pathA, _ := addresspath.NewPathFromString(a.Path)
pathB, _ := addresspath.NewPathFromString(b.Path)
pathA, _ := addresspath.FromString(a.Path)
pathB, _ := addresspath.FromString(b.Path)

return cmp.Compare(pathA.AddressType(), pathB.AddressType())
})
}

func (v *Vault) SortAddressesByAddressIndex(addrs ...AddressInfo) {
slices.SortStableFunc(addrs, func(a, b AddressInfo) int {
pathA, _ := addresspath.NewPathFromString(a.Path)
pathB, _ := addresspath.NewPathFromString(b.Path)
pathA, _ := addresspath.FromString(a.Path)
pathB, _ := addresspath.FromString(b.Path)

return cmp.Compare(pathA.AddressIndex(), pathB.AddressIndex())
})
Expand Down Expand Up @@ -370,7 +385,7 @@ func (v *Vault) PrivateKeys(password string, addrs []string) ([]crypto.PrivateKe
return nil, NewErrAddressNotFound(addr)
}

path, err := addresspath.NewPathFromString(info.Path)
path, err := addresspath.FromString(info.Path)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -484,7 +499,7 @@ func (v *Vault) AddressInfo(addr string) *AddressInfo {
return nil
}

path, err := addresspath.NewPathFromString(info.Path)
path, err := addresspath.FromString(info.Path)
if err != nil {
return nil
}
Expand Down Expand Up @@ -513,7 +528,7 @@ func (v *Vault) AddressInfo(addr string) *AddressInfo {
return nil
}

p, err := addresspath.NewPathFromString(info.Path)
p, err := addresspath.FromString(info.Path)
if err != nil {
return nil
}
Expand Down
20 changes: 17 additions & 3 deletions wallet/vault/vault_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func TestAddressInfo(t *testing.T) {
// assert.Equal(t, i.Address, info.PublicKey)

addr, _ := crypto.AddressFromString(info.Address)
path, _ := addresspath.NewPathFromString(info.Path)
path, _ := addresspath.FromString(info.Path)

switch path.Purpose() {
case H(PurposeBLS12381):
Expand Down Expand Up @@ -123,6 +123,20 @@ func TestSortAddressInfo(t *testing.T) {
assert.Equal(t, "m/65535'/21888'/2'/0'", infos[len(infos)-1].Path)
}

func TestAllAccountAddresses(t *testing.T) {
td := setup(t)

assert.Equal(t, td.vault.AddressCount(), 6)

accountAddrs := td.vault.AllAccountAddresses()
for _, i := range accountAddrs {
path, err := addresspath.FromString(i.Path)
assert.NoError(t, err)

assert.NotEqual(t, H(crypto.AddressTypeValidator), path.AddressType())
}
}

func TestAllValidatorAddresses(t *testing.T) {
td := setup(t)

Expand All @@ -133,7 +147,7 @@ func TestAllValidatorAddresses(t *testing.T) {
info := td.vault.AddressInfo(i.Address)
assert.Equal(t, i.Address, info.Address)

path, _ := addresspath.NewPathFromString(info.Path)
path, _ := addresspath.FromString(info.Path)

switch path.Purpose() {
case H(PurposeBLS12381):
Expand Down Expand Up @@ -191,7 +205,7 @@ func TestAllImportedPrivateKeysAddresses(t *testing.T) {
assert.Equal(t, i.Address, info.Address)

addr, _ := crypto.AddressFromString(info.Address)
path, _ := addresspath.NewPathFromString(info.Path)
path, _ := addresspath.FromString(info.Path)

if addr.IsValidatorAddress() {
assert.Equal(t, info.Path, fmt.Sprintf("m/%d'/%d'/1'/%d'",
Expand Down
4 changes: 4 additions & 0 deletions wallet/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,10 @@
return w.store.Vault.AllValidatorAddresses()
}

func (w *Wallet) AllAccountAddresses() []vault.AddressInfo {
return w.store.Vault.AllAccountAddresses()

Check warning on line 405 in wallet/wallet.go

View check run for this annotation

Codecov / codecov/patch

wallet/wallet.go#L405 

Added line #L405 was not covered by tests
}

func (w *Wallet) AddressFromPath(p string) *vault.AddressInfo {
return w.store.Vault.AddressFromPath(p)
}
Expand Down
Loading