services/horizon/internal/ingest/processors: Accommodate eviction of …

…soroban ledger entries in asset stats endpoint (#5033)
stellar · Nov 17, 2023 · 11e5322 · 11e5322
1 parent d0c8a91
commit 11e5322
Show file tree

Hide file tree

Showing 30 changed files with 3,296 additions and 1,510 deletions.
diff --git a/protocols/horizon/main.go b/protocols/horizon/main.go
@@ -173,12 +173,14 @@ type AssetStat struct {
 	NumClaimableBalances int32 `json:"num_claimable_balances"`
 	NumLiquidityPools    int32 `json:"num_liquidity_pools"`
 	NumContracts         int32 `json:"num_contracts"`
+	NumArchivedContracts int32 `json:"num_archived_contracts"`
 	// Action needed in release: horizon-v3.0.0: deprecated field
 	Amount                  string            `json:"amount"`
 	Accounts                AssetStatAccounts `json:"accounts"`
 	ClaimableBalancesAmount string            `json:"claimable_balances_amount"`
 	LiquidityPoolsAmount    string            `json:"liquidity_pools_amount"`
 	ContractsAmount         string            `json:"contracts_amount"`
+	ArchivedContractsAmount string            `json:"archived_contracts_amount"`
 	Balances                AssetStatBalances `json:"balances"`
 	Flags                   AccountFlags      `json:"flags"`
 }

diff --git a/services/horizon/docker/captive-core-integration-tests.cfg b/services/horizon/docker/captive-core-integration-tests.cfg
@@ -1,11 +1,12 @@
 PEER_PORT=11725
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
-ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true
-TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
 
 UNSAFE_QUORUM=true
 FAILURE_SAFETY=0
 
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true
+TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
+
 [[VALIDATORS]]
 NAME="local_core"
 HOME_DOMAIN="core.local"

diff --git a/services/horizon/docker/stellar-core-integration-tests.cfg b/services/horizon/docker/stellar-core-integration-tests.cfg
@@ -1,5 +1,4 @@
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
-TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
 
 NETWORK_PASSPHRASE="Standalone Network ; February 2017"
 
@@ -15,11 +14,13 @@ FAILURE_SAFETY=0
 
 DATABASE="postgresql://user=postgres password=mysecretpassword host=core-postgres port=5641 dbname=stellar"
 
+TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
+
 [QUORUM_SET]
 THRESHOLD_PERCENT=100
 VALIDATORS=["GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"]
 
 [HISTORY.vs]
 get="cp history/vs/{0} {1}"
 put="cp {0} history/vs/{1}"
-mkdir="mkdir -p history/vs/{0}"
+mkdir="mkdir -p history/vs/{0}"
diff --git a/services/horizon/internal/actions/asset.go b/services/horizon/internal/actions/asset.go
@@ -81,7 +81,7 @@ func (handler AssetStatsHandler) validateAssetParams(code, issuer string, pq db2
 func (handler AssetStatsHandler) findIssuersForAssets(
 	ctx context.Context,
 	historyQ *history.Q,
-	assetStats []history.ExpAssetStat,
+	assetStats []history.AssetAndContractStat,
 ) (map[string]history.AccountEntry, error) {
 	issuerSet := map[string]bool{}
 	issuers := []string{}

diff --git a/services/horizon/internal/actions/asset_test.go b/services/horizon/internal/actions/asset_test.go
@@ -160,6 +160,7 @@ func TestAssetStats(t *testing.T) {
 		Amount:                  "0.0000001",
 		NumAccounts:             usdAssetStat.NumAccounts,
 		ContractsAmount:         "0.0000000",
+		ArchivedContractsAmount: "0.0000000",
 		Asset: base.Asset{
 			Type:   "credit_alphanum4",
 			Code:   usdAssetStat.AssetCode,
@@ -204,6 +205,7 @@ func TestAssetStats(t *testing.T) {
 		ClaimableBalancesAmount: "0.0000000",
 		LiquidityPoolsAmount:    "0.0000000",
 		ContractsAmount:         "0.0000000",
+		ArchivedContractsAmount: "0.0000000",
 		Amount:                  "0.0000023",
 		NumAccounts:             etherAssetStat.NumAccounts,
 		Asset: base.Asset{
@@ -251,6 +253,7 @@ func TestAssetStats(t *testing.T) {
 		LiquidityPoolsAmount:    "0.0000000",
 		Amount:                  "0.0000001",
 		ContractsAmount:         "0.0000000",
+		ArchivedContractsAmount: "0.0000000",
 		NumAccounts:             otherUSDAssetStat.NumAccounts,
 		Asset: base.Asset{
 			Type:   "credit_alphanum4",
@@ -299,6 +302,7 @@ func TestAssetStats(t *testing.T) {
 		LiquidityPoolsAmount:    "0.0000000",
 		Amount:                  "0.0000111",
 		ContractsAmount:         "0.0000000",
+		ArchivedContractsAmount: "0.0000000",
 		NumAccounts:             eurAssetStat.NumAccounts,
 		Asset: base.Asset{
 			Type:   "credit_alphanum4",
@@ -476,6 +480,7 @@ func TestAssetStatsIssuerDoesNotExist(t *testing.T) {
 		LiquidityPoolsAmount:    "0.0000000",
 		Amount:                  "0.0000001",
 		ContractsAmount:         "0.0000000",
+		ArchivedContractsAmount: "0.0000000",
 		NumAccounts:             usdAssetStat.NumAccounts,
 		Asset: base.Asset{
 			Type:   "credit_alphanum4",

diff --git a/services/horizon/internal/db2/assets/asset_stat.go b/services/horizon/internal/db2/assets/asset_stat.go
diff --git a/services/horizon/internal/db2/assets/asset_stat_test.go b/services/horizon/internal/db2/assets/asset_stat_test.go