Merge pull request #697 from LeoHChen/wallet_fix_on_multi_shards

Wallet fix on multi shards

cmd/client/wallet/main.go

@@ -422,8 +422,10 @@ func convertBalanceIntoReadableFormat(balance *big.Int) string {
 // FetchBalance fetches account balance of specified address from the Harmony network
 func FetchBalance(address common.Address) map[uint32]AccountState {
 	result := make(map[uint32]AccountState)
-	balance := big.NewInt(0)
 	for i := 0; i < walletProfile.Shards; i++ {
+		balance := big.NewInt(0)
+		var nonce uint64
+
 		result[uint32(i)] = AccountState{balance, 0}
 
 		for retry := 0; retry < rpcRetry; retry++ {
@@ -437,31 +439,36 @@ func FetchBalance(address common.Address) map[uint32]AccountState {
 			response, err := client.GetBalance(address)
 			if err != nil {
 				log.Info("failed to get balance, retrying ...")
+				time.Sleep(200 * time.Millisecond)
 				continue
 			}
 			log.Debug("FetchBalance", "response", response)
 			balance.SetBytes(response.Balance)
-			result[uint32(i)] = AccountState{balance, response.Nonce}
+			nonce = response.Nonce
 			break
 		}
+		result[uint32(i)] = AccountState{balance, nonce}
 	}
 	return result
 }
 
 // GetFreeToken requests for token test token on each shard
 func GetFreeToken(address common.Address) {
-	for retry := 0; retry < rpcRetry; retry++ {
+	for i := 0; i < walletProfile.Shards; i++ {
-		// use the 1st server from shard 0 (beacon chain) to make the getFreeToken call
+		// use the 1st server (leader) to make the getFreeToken call
-		server := walletProfile.RPCServer[0][0]
+		server := walletProfile.RPCServer[i][0]
 		client, err := clientService.NewClient(server.IP, server.Port)
 		if err != nil {
 			continue
 		}
 
 		log.Debug("GetFreeToken", "server", server)
+
+		for retry := 0; retry < rpcRetry; retry++ {
 			response, err := client.GetFreeToken(address)
 			if err != nil {
 				log.Info("failed to get free token, retrying ...")
+				time.Sleep(200 * time.Millisecond)
 				continue
 			}
 			log.Debug("GetFreeToken", "response", response)
@@ -471,6 +478,7 @@ func GetFreeToken(address common.Address) {
 			break
 		}
 	}
+}
 
 // ReadAddresses reads the addresses stored in local keystore
 func ReadAddresses() []common.Address {