Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions data/basics/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const (
checksumLength = 4
)

var base32Encoder = base32.StdEncoding.WithPadding(base32.NoPadding)

// GetChecksum returns the checksum as []byte
// Checksum in Algorand are the last 4 bytes of the shortAddress Hash. H(Address)[28:]
func (addr Address) GetChecksum() []byte {
Expand All @@ -48,7 +50,8 @@ func (addr Address) GetUserAddress() string {

// UnmarshalChecksumAddress tries to unmarshal the checksummed address string.
func UnmarshalChecksumAddress(address string) (Address, error) {
decoded, err := base32.StdEncoding.WithPadding(base32.NoPadding).DecodeString(address)
decoded, err := base32Encoder.DecodeString(address)

if err != nil {
return Address{}, fmt.Errorf("failed to decode address %s to base 32", address)
}
Expand Down Expand Up @@ -77,9 +80,12 @@ func UnmarshalChecksumAddress(address string) (Address, error) {

// String returns a string representation of Address
func (addr Address) String() string {
var addrWithChecksum []byte
addrWithChecksum = append(addr[:], addr.GetChecksum()...)
return base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(addrWithChecksum)
addrWithChecksum := make([]byte, crypto.DigestSize+checksumLength)
copy(addrWithChecksum[:crypto.DigestSize], addr[:])
// calling addr.GetChecksum() here takes 20ns more than just rolling it out, so we'll just repeat that code.
shortAddressHash := crypto.Hash(addr[:])
Comment thread
pzbitskiy marked this conversation as resolved.
copy(addrWithChecksum[crypto.DigestSize:], shortAddressHash[len(shortAddressHash)-checksumLength:])
return base32Encoder.EncodeToString(addrWithChecksum)
}

// MarshalText returns the address string as an array of bytes
Expand Down
26 changes: 26 additions & 0 deletions data/basics/address_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,29 @@ func TestAddressMarshalUnmarshal(t *testing.T) {
require.NoError(t, err)
require.Equal(t, testob, nob)
}

func BenchmarkAddressFormatting(b *testing.B) {
addr := "J5YDZLPOHWB5O6MVRHNFGY4JXIQAYYM6NUJWPBSYBBIXH5ENQ4Z5LTJELU"
uaddr, err := UnmarshalChecksumAddress(addr)
require.NoError(b, err)

b.ResetTimer()

for i := 0; i < b.N; i++ {
stringed := uaddr.String()
if len(stringed) == 0 {
break
}
}
}

func BenchmarkUnmarshalChecksumAddress(b *testing.B) {
addr := "J5YDZLPOHWB5O6MVRHNFGY4JXIQAYYM6NUJWPBSYBBIXH5ENQ4Z5LTJELU"
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, err := UnmarshalChecksumAddress(addr)
if err != nil {
break
}
}
}