services/horizon: Bump Core and soroban-rpc versions (stellar#5130)

tamirms · Dec 11, 2023 · acbe8a0 · acbe8a0
1 parent 31c48bc
commit acbe8a0
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 57 deletions.
diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml
@@ -33,9 +33,9 @@ jobs:
     env:
       HORIZON_INTEGRATION_TESTS_ENABLED: true
       HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.14.1-1529.fcbbad4ce.focal
-      PROTOCOL_20_CORE_DOCKER_IMG: 2opremio/stellar-core:19.14.1-1529.fcbbad4ce.focal
-      PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:20.0.0-rc4pubnet-42
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.14.1-1590.b6b730a0c.focal
+      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:19.14.1-1590.b6b730a0c.focal
+      PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:20.0.0-rc4231129-43
       PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.12.0-1378.2109a168a.focal
       PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.12.0-1378.2109a168a.focal
       PGHOST: localhost

diff --git a/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg b/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg
@@ -1,10 +1,15 @@
 PEER_PORT=11725
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
-ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true
 
 UNSAFE_QUORUM=true
 FAILURE_SAFETY=0
 
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true
+# Lower the TTL of persistent ledger entries
+# so that ledger entry extension/restoring becomes testeable
+TESTING_MINIMUM_PERSISTENT_ENTRY_LIFETIME=10
+TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
+
 [[VALIDATORS]]
 NAME="local_core"
 HOME_DOMAIN="core.local"

diff --git a/services/horizon/internal/integration/contracts/Cargo.lock b/services/horizon/internal/integration/contracts/Cargo.lock
diff --git a/services/horizon/internal/integration/contracts/Cargo.toml b/services/horizon/internal/integration/contracts/Cargo.toml
@@ -25,4 +25,4 @@ lto = true
 [workspace.dependencies.soroban-sdk]
 version = "20.0.0-rc2"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "729ed3ac5fe8600a3245d5816eadd3c95ab2eb54"
+rev = "e35bace9de5addae7c32f405cdc11bb459cb1d61"
diff --git a/services/horizon/internal/integration/testdata/soroban_add_u64.wasm b/services/horizon/internal/integration/testdata/soroban_add_u64.wasm
diff --git a/services/horizon/internal/integration/testdata/soroban_increment_contract.wasm b/services/horizon/internal/integration/testdata/soroban_increment_contract.wasm
diff --git a/services/horizon/internal/integration/testdata/soroban_sac_test.wasm b/services/horizon/internal/integration/testdata/soroban_sac_test.wasm
diff --git a/services/horizon/internal/integration/testdata/soroban_store.wasm b/services/horizon/internal/integration/testdata/soroban_store.wasm
diff --git a/services/horizon/internal/test/integration/integration.go b/services/horizon/internal/test/integration/integration.go
@@ -714,7 +714,7 @@ func (i *Test) WaitUntilLedgerEntryTTL(ledgerKey xdr.LedgerKey) {
 	for attempt := 0; attempt < 50; attempt++ {
 		var result struct {
 			Entries []struct {
-				LiveUntilLedgerSeq *uint32 `json:"liveUntilLedgerSeqLedgerSeq,string,omitempty"`
+				LiveUntilLedgerSeq *uint32 `json:"liveUntilLedgerSeq,omitempty"`
 			} `json:"entries"`
 		}
 		err := client.CallResult(context.Background(), "getLedgerEntries", request, &result)