Merge branch 'main' into 1066-add-missing-methods-to-TopicMessageSubm…

…itTransaction

account_balance_query_e2e_test.go

@@ -24,6 +24,7 @@ package hedera
  */
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -212,3 +213,27 @@ func TestIntegrationAccountBalanceQueryWorksWithHollowAccountAlias(t *testing.T)
 	err = CloseIntegrationTestEnv(env, nil)
 	require.NoError(t, err)
 }
+
+func TestIntegrationAccountBalanceQueryCanConnectToMainnetTls(t *testing.T) {
+	t.Parallel()
+	client := ClientForMainnet()
+	client.SetTransportSecurity(true)
+
+	succeededOnce := false
+	for address, accountID := range client.GetNetwork() {
+
+		if !strings.HasSuffix(address, ":50212") {
+			t.Errorf("Expected entry key to end with ':50212', but got %s", address)
+		}
+
+		accountIDs := []AccountID{accountID}
+		_, err := NewAccountBalanceQuery().
+			SetNodeAccountIDs(accountIDs).
+			SetAccountID(accountID).
+			Execute(client)
+		if err == nil {
+			succeededOnce = true
+		}
+	}
+	assert.True(t, succeededOnce)
+}

endpoint.go

@@ -27,17 +27,17 @@ import (
 )
 
 type Endpoint struct {
-	address    IPv4Address
+	address    []byte
 	port       int32
 	domainName string
 }
 
-func (endpoint *Endpoint) SetAddress(address IPv4Address) *Endpoint {
+func (endpoint *Endpoint) SetAddress(address []byte) *Endpoint {
 	endpoint.address = address
 	return endpoint
 }
 
-func (endpoint *Endpoint) GetAddress() IPv4Address {
+func (endpoint *Endpoint) GetAddress() []byte {
 	return endpoint.address
 }
 
@@ -67,15 +67,15 @@ func EndpointFromProtobuf(serviceEndpoint *services.ServiceEndpoint) Endpoint {
 	}
 
 	return Endpoint{
-		address:    Ipv4AddressFromProtobuf(serviceEndpoint.GetIpAddressV4()),
+		address:    serviceEndpoint.GetIpAddressV4(),
 		port:       port,
 		domainName: serviceEndpoint.GetDomainName(),
 	}
 }
 
 func (endpoint *Endpoint) _ToProtobuf() *services.ServiceEndpoint {
 	return &services.ServiceEndpoint{
-		IpAddressV4: endpoint.address._ToProtobuf(),
+		IpAddressV4: endpoint.address,
 		Port:        endpoint.port,
 		DomainName:  endpoint.domainName,
 	}
@@ -86,6 +86,11 @@ func (endpoint *Endpoint) String() string {
 		// If domain name is populated domainName + port
 		return endpoint.domainName + ":" + fmt.Sprintf("%d", endpoint.port)
 	} else {
-		return endpoint.address.String() + ":" + fmt.Sprintf("%d", endpoint.port)
+		return fmt.Sprintf("%d.%d.%d.%d:%d",
+			int(endpoint.address[0])&0xFF,
+			int(endpoint.address[1])&0xFF,
+			int(endpoint.address[2])&0xFF,
+			int(endpoint.address[3])&0xFF,
+			endpoint.port)
 	}
 }

examples/dab/main.go

@@ -36,8 +36,7 @@ func main() {
 	description := "Hedera™ cryptocurrency"
 	newDescription := "Hedera™ cryptocurrency - updated"
 
-	ipv4 := hedera.IPv4Address{}
-	ipv4.SetNetwork(0, 0).SetHost(0, 0)
+	ipv4 := []byte{127, 0, 0, 1}
 
 	gossipEndpoint := hedera.Endpoint{}
 	gossipEndpoint.SetAddress(ipv4).SetPort(50211)

node_create_transaction_unit_test.go

@@ -78,16 +78,7 @@ func endpoints(offsets ...uint) []Endpoint {
 
 	for _, offset := range offsets {
 		endpoints = append(endpoints, Endpoint{
-			address: IPv4Address{
-				network: IPv4AddressPart{
-					left:  byte(offset),
-					right: byte(offset),
-				},
-				host: IPv4AddressPart{
-					left:  byte(offset),
-					right: byte(offset),
-				},
-			},
+			address: []byte{byte(offset), byte(offset), byte(offset), byte(offset)},
 		})
 	}
 

query.go

@@ -203,7 +203,7 @@ func (q *Query) SetPaymentTransactionID(transactionID TransactionID) *Query {
 
 func (q *Query) execute(client *Client, e QueryInterface) (*services.Response, error) {
 	q.client = client
-	if client == nil || client.operator == nil {
+	if client == nil {
 		return nil, errNoClientProvided
 	}