Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump XDR once more #5023

Merged
merged 7 commits into from
Aug 31, 2023
Merged

Bump XDR once more #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f383fa
Bump XDR to 7015193879e9da7cb70d889a49eecf494fefe7e1
2opremio Aug 22, 2023
18a300a
Adapt code to XDR changes
2opremio Aug 22, 2023
f77c5d6
Add support for TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE
2opremio Aug 29, 2023
1ed056b
Bump soroban rpc, core and use TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE
2opremio Aug 29, 2023
14f0186
BUmp test contracts
2opremio Aug 29, 2023
06d3238
Bump soroban-rpc based off https://github.com/stellar/soroban-tools/p…
2opremio Aug 30, 2023
6e9b5bb
Use separate core config file for pre-soroban config options
2opremio Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/horizon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
176 changes: 69 additions & 107 deletions gxdr/xdr_generated.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ingest/ledgerbackend/toml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions services/horizon/docker/captive-core-integration-tests.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/horizon/docker/docker-compose.integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 24 additions & 0 deletions services/horizon/docker/stellar-core-classic-integration-tests.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
1 change: 1 addition & 0 deletions services/horizon/docker/stellar-core-integration-tests.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true
2opremio marked this conversation as resolved.
Show resolved Hide resolved

NETWORK_PASSPHRASE="Standalone Network ; February 2017"

Expand Down
6 changes: 6 additions & 0 deletions services/horizon/internal/codes/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,8 @@
return "resource_limit_exceeded", nil
case xdr.InvokeHostFunctionResultCodeInvokeHostFunctionEntryExpired:
return "entry_expired", nil
case xdr.InvokeHostFunctionResultCodeInvokeHostFunctionInsufficientRefundableFee:
return "insufficient_refundable_fee", nil

Check failure on line 508 in services/horizon/internal/codes/main.go

View workflow job for this annotation

GitHub Actions / golangci 

string `insufficient_refundable_fee` has 3 occurrences, make it a constant (goconst)
}
case xdr.BumpFootprintExpirationResultCode:
switch code {
Expand All @@ -513,6 +515,8 @@
return OpMalformed, nil
case xdr.BumpFootprintExpirationResultCodeBumpFootprintExpirationResourceLimitExceeded:
return "resource_limit_exceeded", nil
case xdr.BumpFootprintExpirationResultCodeBumpFootprintExpirationInsufficientRefundableFee:
return "insufficient_refundable_fee", nil
}
case xdr.RestoreFootprintResultCode:
switch code {
Expand All @@ -522,6 +526,8 @@
return OpMalformed, nil
case xdr.RestoreFootprintResultCodeRestoreFootprintResourceLimitExceeded:
return "resource_limit_exceeded", nil
case xdr.RestoreFootprintResultCodeRestoreFootprintInsufficientRefundableFee:
return "insufficient_refundable_fee", nil
}
}

Expand Down
Loading
Loading