more bools

Author: rohenaz

address.go

@@ -90,13 +90,13 @@ func ValidA58(a58 []byte) (bool, error) {
 }
 
 // GetAddressFromPrivateKey takes a private key string and returns a Bitcoin address
-func GetAddressFromPrivateKey(privateKey string) (string, error) {
+func GetAddressFromPrivateKey(privateKey string, compressed bool) (string, error) {
 	rawKey, err := PrivateKeyFromString(privateKey)
 	if err != nil {
 		return "", err
 	}
 	var address *bsvutil.LegacyAddressPubKeyHash
-	if address, err = GetAddressFromPubKey(rawKey.PubKey(), true); err != nil {
+	if address, err = GetAddressFromPubKey(rawKey.PubKey(), compressed); err != nil {
 		return "", err
 	}
 	return address.EncodeAddress(), nil
@@ -120,12 +120,12 @@ func GetAddressFromPubKey(publicKey *bsvec.PublicKey, compressed bool) (*bsvutil
 }
 
 // GetAddressFromPubKeyString is a convenience function to use a hex string pubKey
-func GetAddressFromPubKeyString(pubKey string) (*bsvutil.LegacyAddressPubKeyHash, error) {
+func GetAddressFromPubKeyString(pubKey string, compressed bool) (*bsvutil.LegacyAddressPubKeyHash, error) {
 	rawPubKey, err := PubKeyFromString(pubKey)
 	if err != nil {
 		return nil, err
 	}
-	return GetAddressFromPubKey(rawPubKey, true)
+	return GetAddressFromPubKey(rawPubKey, compressed)
 }
 
 // GetAddressFromScript will take an output script and extract a standard bitcoin address

address_test.go

@@ -86,7 +86,7 @@ func TestGetAddressFromPrivateKey(t *testing.T) {
 
 	// Run tests
 	for _, test := range tests {
-		if address, err := GetAddressFromPrivateKey(test.input); err != nil && !test.expectedError {
+		if address, err := GetAddressFromPrivateKey(test.input, true); err != nil && !test.expectedError {
 			t.Errorf("%s Failed: [%s] inputted and error not expected but got: %s", t.Name(), test.input, err.Error())
 		} else if err == nil && test.expectedError {
 			t.Errorf("%s Failed: [%s] inputted and error was expected", t.Name(), test.input)
@@ -98,7 +98,7 @@ func TestGetAddressFromPrivateKey(t *testing.T) {
 
 // ExampleGetAddressFromPrivateKey example using GetAddressFromPrivateKey()
 func ExampleGetAddressFromPrivateKey() {
-	address, err := GetAddressFromPrivateKey("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd")
+	address, err := GetAddressFromPrivateKey("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd", true)
 	if err != nil {
 		fmt.Printf("error occurred: %s", err.Error())
 		return
@@ -111,7 +111,7 @@ func ExampleGetAddressFromPrivateKey() {
 func BenchmarkGetAddressFromPrivateKey(b *testing.B) {
 	key, _ := CreatePrivateKeyString()
 	for i := 0; i < b.N; i++ {
-		_, _ = GetAddressFromPrivateKey(key)
+		_, _ = GetAddressFromPrivateKey(key, true)
 	}
 }
 
@@ -250,7 +250,7 @@ func TestGetAddressFromPubKeyString(t *testing.T) {
 
 	// Run tests
 	for _, test := range tests {
-		if rawKey, err := GetAddressFromPubKeyString(test.input); err != nil && !test.expectedError {
+		if rawKey, err := GetAddressFromPubKeyString(test.input, true); err != nil && !test.expectedError {
 			t.Errorf("%s Failed: [%v] inputted and error not expected but got: %s", t.Name(), test.input, err.Error())
 		} else if err == nil && test.expectedError {
 			t.Errorf("%s Failed: [%v] inputted and error was expected", t.Name(), test.input)
@@ -266,7 +266,7 @@ func TestGetAddressFromPubKeyString(t *testing.T) {
 
 // ExampleGetAddressFromPubKeyString example using GetAddressFromPubKeyString()
 func ExampleGetAddressFromPubKeyString() {
-	rawAddress, err := GetAddressFromPubKeyString("03ce8a73eb5e4d45966d719ac3ceb431cd0ee203e6395357a167b9abebc4baeacf")
+	rawAddress, err := GetAddressFromPubKeyString("03ce8a73eb5e4d45966d719ac3ceb431cd0ee203e6395357a167b9abebc4baeacf", true)
 	if err != nil {
 		fmt.Printf("error occurred: %s", err.Error())
 		return
@@ -278,6 +278,6 @@ func ExampleGetAddressFromPubKeyString() {
 // BenchmarkGetAddressFromPubKeyString benchmarks the method GetAddressFromPubKeyString()
 func BenchmarkGetAddressFromPubKeyString(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		_, _ = GetAddressFromPubKeyString("03ce8a73eb5e4d45966d719ac3ceb431cd0ee203e6395357a167b9abebc4baeacf")
+		_, _ = GetAddressFromPubKeyString("03ce8a73eb5e4d45966d719ac3ceb431cd0ee203e6395357a167b9abebc4baeacf", true)
 	}
 }

examples/address_from_private_key/address_from_private_key.go

@@ -16,7 +16,7 @@ func main() {
 
 	// Get an address
 	var address string
-	if address, err = bitcoin.GetAddressFromPrivateKey(privateKey); err != nil {
+	if address, err = bitcoin.GetAddressFromPrivateKey(privateKey, true); err != nil {
 		log.Fatalf("error occurred: %s", err.Error())
 	}
 

examples/script_from_address/script_from_address.go

@@ -15,7 +15,7 @@ func main() {
 
 	// Get an address
 	var address string
-	if address, err = bitcoin.GetAddressFromPrivateKey(privateKey); err != nil {
+	if address, err = bitcoin.GetAddressFromPrivateKey(privateKey, true); err != nil {
 		log.Fatalf("error occurred: %s", err.Error())
 	}
 

examples/verify_signature/verify_signature.go

@@ -14,7 +14,7 @@ func main() {
 	message := "This is the example message"
 
 	// Get an address from private key
-	address, err := bitcoin.GetAddressFromPrivateKey(privateKey)
+	address, err := bitcoin.GetAddressFromPrivateKey(privateKey, true)
 	if err != nil {
 		log.Fatalf("error occurred: %s", err.Error())
 	}