fetch branch 'include lastModified field in account balances' from stellar/go

from stellar#942

Author: fuzzyami

protocols/horizon/main.go

@@ -42,6 +42,7 @@ type Account struct {
 	SubentryCount        int32             `json:"subentry_count"`
 	InflationDestination string            `json:"inflation_destination,omitempty"`
 	HomeDomain           string            `json:"home_domain,omitempty"`
+	LastModifiedLedger   uint32            `json:"last_modified_ledger"`
 	Thresholds           AccountThresholds `json:"thresholds"`
 	Flags                AccountFlags      `json:"flags"`
 	Balances             []Balance         `json:"balances"`
@@ -130,6 +131,7 @@ type Balance struct {
 	Limit              string `json:"limit,omitempty"`
 	BuyingLiabilities  string `json:"buying_liabilities"`
 	SellingLiabilities string `json:"selling_liabilities"`
+	LastModifiedLedger uint32 `json:"last_modified_ledger,omitempty"`
 	base.Asset
 }
 

services/horizon/internal/actions_account_test.go

@@ -8,19 +8,29 @@ import (
 )
 
 func TestAccountActions_Show(t *testing.T) {
-	ht := StartHTTPTest(t, "base")
+	ht := StartHTTPTest(t, "allow_trust")
 	defer ht.Finish()
 
 	// existing account
 	w := ht.Get(
-		"/accounts/GBRPYHIL2CI3FNQ4BXLFMNDLFJUNPU2HY3ZMFSHONUCEOASW7QC7OX2H",
+		"/accounts/GCXKG6RN4ONIEPCMNFB732A436Z5PNDSRLGWK7GBLCMQLIFO4S7EYWVU",
 	)
 	if ht.Assert.Equal(200, w.Code) {
 
 		var result horizon.Account
 		err := json.Unmarshal(w.Body.Bytes(), &result)
 		ht.Require.NoError(err)
-		ht.Assert.Equal("3", result.Sequence)
+		ht.Assert.Equal("8589934593", result.Sequence)
+
+		ht.Assert.NotEqual(0, result.LastModifiedLedger)
+		for _, balance := range result.Balances {
+			if balance.Type == "native" {
+				ht.Assert.Equal(uint32(0), balance.LastModifiedLedger)
+			} else {
+				ht.Assert.NotEqual(uint32(0), balance.LastModifiedLedger)
+			}
+		}
+
 	}
 
 	// missing account

services/horizon/internal/db2/core/account.go

@@ -82,6 +82,7 @@ var selectAccount = sq.Select(
 	"a.homedomain",
 	"a.thresholds",
 	"a.flags",
+	"a.lastmodified",
 	// Liabilities can be NULL so can error without `coalesce`:
 	// `Invalid value for xdr.Int64`
 	"coalesce(a.buyingliabilities, 0) as buyingliabilities",

services/horizon/internal/db2/core/main.go

@@ -37,6 +37,7 @@ type Account struct {
 	HomeDomain         null.String
 	Thresholds         xdr.Thresholds
 	Flags              xdr.AccountFlags
+	LastModified       uint32
 	BuyingLiabilities  xdr.Int64 `db:"buyingliabilities"`
 	SellingLiabilities xdr.Int64 `db:"sellingliabilities"`
 }
@@ -144,6 +145,7 @@ type Trustline struct {
 	Tlimit             xdr.Int64
 	Balance            xdr.Int64
 	Flags              int32
+	LastModified 	   uint32     `db:"lastmodified"`
 	BuyingLiabilities  xdr.Int64 `db:"buyingliabilities"`
 	SellingLiabilities xdr.Int64 `db:"sellingliabilities"`
 }

services/horizon/internal/db2/core/trustline.go

@@ -111,6 +111,7 @@ var selectTrustline = sq.Select(
 	"tl.tlimit",
 	"tl.balance",
 	"tl.flags",
+	"tl.lastmodified",
 	// Liabilities can be NULL so can error without `coalesce`:
 	// `Invalid value for xdr.Int64`
 	"coalesce(tl.buyingliabilities, 0) as buyingliabilities",

services/horizon/internal/resourceadapter/account.go

@@ -27,6 +27,7 @@ func PopulateAccount(
 	dest.SubentryCount = ca.Numsubentries
 	dest.InflationDestination = ca.Inflationdest.String
 	dest.HomeDomain = ca.HomeDomain.String
+	dest.LastModifiedLedger = ca.LastModified
 
 	PopulateAccountFlags(&dest.Flags, ca)
 	PopulateAccountThresholds(&dest.Thresholds, ca)

services/horizon/internal/resourceadapter/balance.go

@@ -22,6 +22,7 @@ func PopulateBalance(ctx context.Context, dest *Balance, row core.Trustline) (er
 	dest.Limit = amount.String(row.Tlimit)
 	dest.Issuer = row.Issuer
 	dest.Code = row.Assetcode
+	dest.LastModifiedLedger = row.LastModified
 	return
 }
 
@@ -34,6 +35,7 @@ func PopulateNativeBalance(dest *Balance, stroops, buyingLiabilities, sellingLia
 	dest.Balance = amount.String(stroops)
 	dest.BuyingLiabilities = amount.String(buyingLiabilities)
 	dest.SellingLiabilities = amount.String(sellingLiabilities)
+	dest.LastModifiedLedger = 0
 	dest.Limit = ""
 	dest.Issuer = ""
 	dest.Code = ""