Bump XDR once more (stellar#5023)

* Bump XDR to 7015193879e9da7cb70d889a49eecf494fefe7e1 * Adapt code to XDR changes * Add support for TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE * Bump soroban rpc, core and use TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE * Bump test contracts * Bump soroban-rpc based off stellar/stellar-cli#909 * Use separate core config file for pre-soroban config options
Shaptic · Aug 31, 2023 · 1d913a1 · 1d913a1
1 parent bf6fa60
commit 1d913a1
Show file tree

Hide file tree

Showing 20 changed files with 354 additions and 548 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.13.1-1434.35170ec6c.focal~soroban
-      PROTOCOL_20_CORE_DOCKER_IMG: 2opremio/stellar-core:19.13.1-1434.35170ec6c.focal-soroban
-      PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: 2opremio/soroban-rpc:abeb155963d1669be70d5686cf175ca47faad3ed
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1458.431e4e324.focal~soroban~settings~override
+      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core-next:19.13.1-1458.431e4e324.focal-soroban-settings-override
+      PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:0.9.4-increaseinstructions-26
       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/Makefile b/Makefile
@@ -15,7 +15,7 @@ xdr/Stellar-internal.x \
 xdr/Stellar-contract-config-setting.x
 
 XDRGEN_COMMIT=80e38ef2a96489f6b501d4db3a350406e5aa3bab
-XDRNEXT_COMMIT=1894f0909caa0adb00437564f8e01ec33a5b5ed2
+XDRNEXT_COMMIT=7015193879e9da7cb70d889a49eecf494fefe7e1
 
 .PHONY: xdr xdr-clean xdr-update
 

diff --git a/gxdr/xdr_generated.go b/gxdr/xdr_generated.go
diff --git a/ingest/ledgerbackend/toml.go b/ingest/ledgerbackend/toml.go
@@ -91,6 +91,7 @@ type captiveCoreTomlValues struct {
 	BucketListDBCutoff                    *uint                `toml:"EXPERIMENTAL_BUCKETLIST_DB_INDEX_CUTOFF,omitempty"`
 	EnableSorobanDiagnosticEvents         *bool                `toml:"ENABLE_SOROBAN_DIAGNOSTIC_EVENTS,omitempty"`
 	TestingMinimumPersistentEntryLifetime *uint                `toml:"TESTING_MINIMUM_PERSISTENT_ENTRY_LIFETIME,omitempty"`
+	TestingSorobanHighLimitOverride       *bool                `toml:"TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE,omitempty"`
 }
 
 // QuorumSetIsConfigured returns true if there is a quorum set defined in the configuration.

diff --git a/services/horizon/docker/captive-core-integration-tests.cfg b/services/horizon/docker/captive-core-integration-tests.cfg
@@ -1,6 +1,7 @@
 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

diff --git a/services/horizon/docker/docker-compose.integration-tests.yml b/services/horizon/docker/docker-compose.integration-tests.yml
@@ -28,5 +28,5 @@ services:
     entrypoint: /usr/bin/env
     command: /start standalone
     volumes:
-      - ./stellar-core-integration-tests.cfg:/stellar-core.cfg
+      - ./${CORE_CONFIG_FILE:-stellar-core-integration-tests.cfg}:/stellar-core.cfg
       - ./core-start.sh:/start
diff --git a/services/horizon/docker/stellar-core-classic-integration-tests.cfg b/services/horizon/docker/stellar-core-classic-integration-tests.cfg
@@ -0,0 +1,24 @@
+ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
+
+NETWORK_PASSPHRASE="Standalone Network ; February 2017"
+
+PEER_PORT=11625
+HTTP_PORT=11626
+PUBLIC_HTTP_PORT=true
+
+NODE_SEED="SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK"
+
+NODE_IS_VALIDATOR=true
+UNSAFE_QUORUM=true
+FAILURE_SAFETY=0
+
+DATABASE="postgresql://user=postgres password=mysecretpassword host=core-postgres port=5641 dbname=stellar"
+
+[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}"
diff --git a/services/horizon/docker/stellar-core-integration-tests.cfg b/services/horizon/docker/stellar-core-integration-tests.cfg
@@ -1,4 +1,5 @@
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
+TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
 
 NETWORK_PASSPHRASE="Standalone Network ; February 2017"
 

diff --git a/services/horizon/internal/codes/main.go b/services/horizon/internal/codes/main.go
@@ -504,6 +504,8 @@ func String(code interface{}) (string, error) {
 			return "resource_limit_exceeded", nil
 		case xdr.InvokeHostFunctionResultCodeInvokeHostFunctionEntryExpired:
 			return "entry_expired", nil
+		case xdr.InvokeHostFunctionResultCodeInvokeHostFunctionInsufficientRefundableFee:
+			return "insufficient_refundable_fee", nil
 		}
 	case xdr.BumpFootprintExpirationResultCode:
 		switch code {
@@ -513,6 +515,8 @@ func String(code interface{}) (string, error) {
 			return OpMalformed, nil
 		case xdr.BumpFootprintExpirationResultCodeBumpFootprintExpirationResourceLimitExceeded:
 			return "resource_limit_exceeded", nil
+		case xdr.BumpFootprintExpirationResultCodeBumpFootprintExpirationInsufficientRefundableFee:
+			return "insufficient_refundable_fee", nil
 		}
 	case xdr.RestoreFootprintResultCode:
 		switch code {
@@ -522,6 +526,8 @@ func String(code interface{}) (string, error) {
 			return OpMalformed, nil
 		case xdr.RestoreFootprintResultCodeRestoreFootprintResourceLimitExceeded:
 			return "resource_limit_exceeded", nil
+		case xdr.RestoreFootprintResultCodeRestoreFootprintInsufficientRefundableFee:
+			return "insufficient_refundable_fee", nil
 		}
 	}