fix: Account Alias Mirror Node Queries

Taskfile.yml

@@ -44,7 +44,6 @@ tasks:
                         if [ -f main.go ]; then
                             echo "Running $example/main.go"
                             env OPERATOR_KEY="302e020100300506032b65700422042091132178e72057a1d7528025956fe39b0b847f200ab59b2fdd367017f3087137" OPERATOR_ID="0.0.2" HEDERA_NETWORK="localhost" go run main.go
-                            fi
                         fi
                         popd > /dev/null
                     fi

account_balance_query.go

@@ -21,6 +21,7 @@ package hedera
  */
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/hashgraph/hedera-protobufs-go/services"
@@ -113,15 +114,11 @@ func (q *AccountBalanceQuery) Execute(client *Client) (AccountBalance, error) {
 		return AccountBalance{}, err
 	}
 
-	balance := _AccountBalanceFromProtobuf(resp.(*services.Response).GetCryptogetAccountBalance())
+	protobufResponse := resp.(*services.Response).GetCryptogetAccountBalance()
+	balance := _AccountBalanceFromProtobuf(protobufResponse)
 
-	// accountId value could be either in q.accountID or q.contractID
-	accountId := q.accountID.String()
-	if accountId == "" {
-		accountId = q.contractID.String()
-	}
+	err = fetchTokenBalances(fetchMirrorNodeUrlFromClient(client), fmt.Sprint(protobufResponse.GetAccountID().GetAccountNum()), &balance)
 
-	err = fetchTokenBalances(fetchMirrorNodeUrlFromClient(client), accountId, &balance)
 	if err != nil {
 		return balance, err
 	}

account_balance_query_e2e_test.go

@@ -25,7 +25,6 @@ package hedera
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -78,9 +77,6 @@ func TestIntegrationAccountBalanceQueryCanGetTokenBalance(t *testing.T) {
 
 	tokenID := receipt.TokenID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	balance, err := NewAccountBalanceQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(env.Client.GetOperatorAccountID()).
@@ -89,6 +85,7 @@ func TestIntegrationAccountBalanceQueryCanGetTokenBalance(t *testing.T) {
 
 	assert.Equal(t, uint64(1000000), balance.Tokens.Get(*tokenID))
 	assert.Equal(t, uint64(3), balance.TokenDecimals.Get(*tokenID))
+
 	err = CloseIntegrationTestEnv(env, tokenID)
 	require.NoError(t, err)
 }
@@ -203,3 +200,34 @@ func TestIntegrationAccountBalanceQueryNoAccountIDError(t *testing.T) {
 	err = CloseIntegrationTestEnv(env, nil)
 	require.NoError(t, err)
 }
+func TestIntegrationAccountBalanceQueryWorksWithHollowAccountAlias(t *testing.T) {
+	t.Parallel()
+	env := NewIntegrationTestEnv(t)
+
+	privateKey, err := PrivateKeyGenerateEcdsa()
+	require.NoError(t, err)
+
+	// Extract the ECDSA public key public key
+	publicKey := privateKey.PublicKey()
+	// Extract the Ethereum public address
+	aliasAccountId := *publicKey.ToAccountID(0, 0)
+	evmAddress := publicKey.ToEvmAddress()
+
+	evmAddressAccount, err := AccountIDFromEvmPublicAddress(evmAddress)
+	require.NoError(t, err)
+
+	// Transfer tokens using the `TransferTransaction` to the Etherum Account Address
+	tx, err := NewTransferTransaction().AddHbarTransfer(evmAddressAccount, NewHbar(4)).
+		AddHbarTransfer(env.OperatorID, NewHbar(-4)).Execute(env.Client)
+	require.NoError(t, err)
+
+	// Get the child receipt or child record to return the Hedera Account ID for the new account that was created
+	_, err = tx.GetReceiptQuery().SetIncludeChildren(true).Execute(env.Client)
+	require.NoError(t, err)
+
+	_, err = NewAccountBalanceQuery().SetAccountID(aliasAccountId).Execute(env.Client)
+	require.NoError(t, err)
+
+	err = CloseIntegrationTestEnv(env, nil)
+	require.NoError(t, err)
+}

account_create_transaction_e2e_test.go

@@ -26,7 +26,6 @@ package hedera
 import (
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -322,9 +321,6 @@ func TestIntegrationAccountCreateTransactionWithAliasFromAdminKey(t *testing.T)
 
 	accountID := *receipt.AccountID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		Execute(env.Client)
@@ -370,9 +366,6 @@ func TestIntegrationAccountCreateTransactionWithAliasFromAdminKeyWithReceiverSig
 
 	accountID := *receipt.AccountID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		Execute(env.Client)
@@ -454,9 +447,6 @@ func TestIntegrationAccountCreateTransactionWithAlias(t *testing.T) {
 
 	accountID := *receipt.AccountID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		Execute(env.Client)
@@ -538,9 +528,6 @@ func TestIntegrationAccountCreateTransactionWithAliasWithReceiverSigRequired(t *
 
 	accountID := *receipt.AccountID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		Execute(env.Client)

account_info_query.go

@@ -21,6 +21,7 @@ package hedera
  */
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/hashgraph/hedera-protobufs-go/services"
@@ -56,12 +57,14 @@ func (q *AccountInfoQuery) Execute(client *Client) (AccountInfo, error) {
 		return AccountInfo{}, err
 	}
 
-	info, err := _AccountInfoFromProtobuf(resp.GetCryptoGetInfo().AccountInfo)
+	protobufResponse := resp.GetCryptoGetInfo().AccountInfo
+	info, err := _AccountInfoFromProtobuf(protobufResponse)
 	if err != nil {
 		return AccountInfo{}, err
 	}
 
-	err = fetchAccountInfoTokenRelationships(fetchMirrorNodeUrlFromClient(client), q.accountID.String(), &info)
+	err = fetchAccountInfoTokenRelationships(fetchMirrorNodeUrlFromClient(client), fmt.Sprint(protobufResponse.AccountID.GetAccountNum()), &info)
+
 	if err != nil {
 		return info, err
 	}

account_info_query_e2e_test.go

@@ -25,7 +25,6 @@ package hedera
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -54,9 +53,6 @@ func TestIntegrationAccountInfoQueryCanExecute(t *testing.T) {
 	accountID := *receipt.AccountID
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		SetNodeAccountIDs([]AccountID{resp.NodeID}).
@@ -113,9 +109,6 @@ func TestIntegrationAccountInfoQueryGetCost(t *testing.T) {
 	accountID := *receipt.AccountID
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	accountInfo := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		SetMaxQueryPayment(NewHbar(1)).
@@ -229,9 +222,6 @@ func TestIntegrationAccountInfoQuerySetBigMaxPayment(t *testing.T) {
 	accountID := *receipt.AccountID
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	accountInfo := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		SetMaxQueryPayment(NewHbar(1000000)).
@@ -399,9 +389,6 @@ func TestIntegrationAccountInfoQueryTokenRelationshipStatuses(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(accountID).
@@ -441,9 +428,6 @@ func TestIntegrationAccountInfoQueryTokenRelationshipStatuses(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err = NewAccountInfoQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(accountID).
@@ -515,9 +499,6 @@ func TestIntegrationAccountInfoQueryTokenRelationship(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(accountID).
@@ -562,9 +543,6 @@ func TestIntegrationAccountInfoQueryTokenRelationship(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err = NewAccountInfoQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(accountID).
@@ -588,9 +566,6 @@ func TestIntegrationAccountInfoQueryTokenRelationship(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err = NewAccountInfoQuery().
 		SetNodeAccountIDs(env.NodeAccountIDs).
 		SetAccountID(accountID).
@@ -600,3 +575,69 @@ func TestIntegrationAccountInfoQueryTokenRelationship(t *testing.T) {
 	assert.Equal(t, accountID, info.AccountID)
 	assert.Equal(t, 0, len(info.TokenRelationships))
 }
+
+func TestIntegrationAccountInfoQueryWorksWithHollowAccountAlias(t *testing.T) {
+	t.Parallel()
+	env := NewIntegrationTestEnv(t)
+
+	// Create NFT
+	cid := []string{"QmNPCiNA3Dsu3K5FxDPMG5Q3fZRwVTg14EXA92uqEeSRXn"}
+	// Creating the transaction for token creation
+	nftCreateTransaction, err := NewTokenCreateTransaction().
+		SetTokenName("HIP-542 Example Collection").SetTokenSymbol("HIP-542").
+		SetTokenType(TokenTypeNonFungibleUnique).SetDecimals(0).
+		SetInitialSupply(0).SetMaxSupply(int64(len(cid))).
+		SetTreasuryAccountID(env.OperatorID).SetSupplyType(TokenSupplyTypeFinite).
+		SetAdminKey(env.OperatorKey).SetFreezeKey(env.OperatorKey).SetWipeKey(env.OperatorKey).SetSupplyKey(env.OperatorKey).FreezeWith(env.Client)
+
+	// Sign the transaction with the operator key
+	nftSignTransaction := nftCreateTransaction.Sign(env.OperatorKey)
+	// Submit the transaction to the Hedera network
+	nftCreateSubmit, err := nftSignTransaction.Execute(env.Client)
+	require.NoError(t, err)
+
+	// Get transaction receipt information
+	nftCreateReceipt, err := nftCreateSubmit.GetReceipt(env.Client)
+	require.NoError(t, err)
+
+	// Get token id from the transaction
+	nftTokenID := *nftCreateReceipt.TokenID
+
+	nftCollection := []TransactionReceipt{}
+
+	for _, s := range cid {
+		mintTransaction, err := NewTokenMintTransaction().SetTokenID(nftTokenID).SetMetadata([]byte(s)).FreezeWith(env.Client)
+		require.NoError(t, err)
+		mintTransactionSubmit, err := mintTransaction.Sign(env.OperatorKey).Execute(env.Client)
+		require.NoError(t, err)
+		receipt, err := mintTransactionSubmit.GetReceipt(env.Client)
+		require.NoError(t, err)
+		nftCollection = append(nftCollection, receipt)
+	}
+	exampleNftId := nftTokenID.Nft(nftCollection[0].SerialNumbers[0])
+
+	privateKey, err := PrivateKeyGenerateEcdsa()
+	require.NoError(t, err)
+
+	// Extract the ECDSA public key public key
+	publicKey := privateKey.PublicKey()
+	// Extract the Ethereum public address
+	aliasAccountId := publicKey.ToAccountID(0, 0)
+
+	nftTransferTransaction, err := NewTransferTransaction().AddNftTransfer(exampleNftId, env.OperatorID, *aliasAccountId).FreezeWith(env.Client)
+	require.NoError(t, err)
+
+	// Sign the transaction with the operator key
+	nftTransferTransactionSign := nftTransferTransaction.Sign(env.OperatorKey)
+	// Submit the transaction to the Hedera network
+	nftTransferTransactionSubmit, err := nftTransferTransactionSign.Execute(env.Client)
+	require.NoError(t, err)
+	_, err = nftTransferTransactionSubmit.SetValidateStatus(true).GetReceipt(env.Client)
+	require.NoError(t, err)
+
+	_, err = NewAccountInfoQuery().
+		SetNodeAccountIDs(env.NodeAccountIDs).
+		SetAccountID(*aliasAccountId).
+		Execute(env.Client)
+	assert.NoError(t, err)
+}

account_update_transaction_e2e_test.go

@@ -77,9 +77,6 @@ func TestIntegrationAccountUpdateTransactionCanExecute(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		SetNodeAccountIDs([]AccountID{resp.NodeID}).
@@ -148,9 +145,6 @@ func TestIntegrationAccountUpdateTransactionNoSigning(t *testing.T) {
 	_, err = resp.SetValidateStatus(true).GetReceipt(env.Client)
 	require.NoError(t, err)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewAccountInfoQuery().
 		SetAccountID(accountID).
 		SetNodeAccountIDs([]AccountID{resp.NodeID}).

contract_create_transaction_e2e_test.go

@@ -25,7 +25,6 @@ package hedera
 
 import (
 	"encoding/hex"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -127,9 +126,6 @@ func TestIntegrationContractCreateTransactionNoAdminKey(t *testing.T) {
 	assert.NotNil(t, receipt.ContractID)
 	contractID := *receipt.ContractID
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	info, err := NewContractInfoQuery().
 		SetNodeAccountIDs([]AccountID{resp.NodeID}).
 		SetContractID(contractID).

contract_id_e2e_test.go

@@ -66,9 +66,6 @@ func TestIntegrationContractIDCanPopulateAccountNumber(t *testing.T) {
 
 	require.NotNil(t, receipt.ContractID)
 
-	// sleep in order for mirror node information to update
-	time.Sleep(3 * time.Second)
-
 	contractID := *receipt.ContractID
 	info, err := NewContractInfoQuery().SetContractID(contractID).Execute(env.Client)
 	require.NoError(t, err)