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.

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

Bump dependencies for protocol 21 #135

Merged
merged 30 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4636356
Bump dependencies for protocol 21
2opremio Apr 15, 2024
89cf0d1
Update cargo lock file
2opremio Apr 15, 2024
a042604
Bump stellar core image using private one
2opremio Apr 15, 2024
1f07448
Pass bucket list size from meta to simulation NetworkConfig
2opremio Apr 15, 2024
4208775
Run go mod tidy
2opremio Apr 15, 2024
6ef2fbd
Do correct casting for bucket list size
2opremio Apr 15, 2024
989b62b
Bump protocol number to 21
2opremio Apr 15, 2024
0fd535a
Fix integration tests
2opremio Apr 15, 2024
85fcf3e
Bump core debian packahe
2opremio Apr 15, 2024
eefac56
Clean up core version
2opremio Apr 15, 2024
6d32139
Run cargo fmt
2opremio Apr 15, 2024
8739fcb
Fix GetPreflight test
2opremio Apr 15, 2024
22365c9
Replace private stellar core image by official one
2opremio Apr 15, 2024
4575e26
Merge remote-tracking branch 'origin/main' into protocol21
2opremio Apr 16, 2024
25aa244
Bump system test dependencies
2opremio Apr 16, 2024
0b92aca
updated e2e component references
sreuland Apr 17, 2024
695158a
Run integration tests for both protocol 20 and 21
2opremio Apr 17, 2024
31a9b09
Revert "updated e2e component references"
2opremio Apr 17, 2024
479e8f9
Fix dependency checking tool
2opremio Apr 17, 2024
3573e93
Reapply "updated e2e component references"
2opremio Apr 17, 2024
708d3d2
Revert "Reapply "updated e2e component references""
2opremio Apr 17, 2024
ee33858
Revert "Bump system test dependencies"
2opremio Apr 17, 2024
aaf48ff
Bump rs-soroban-env to fix simulation hiccup with p20
2opremio Apr 17, 2024
4e9c762
Make integration tests pass with both protocol 20 and 21
2opremio Apr 17, 2024
4fa2777
Bump dependencies again
2opremio Apr 17, 2024
46537d1
Merge branch 'main' into protocol21
2opremio Apr 17, 2024
15a6ac5
Temporarily disable rs-stellar-xdr check
2opremio Apr 18, 2024
fef7780
Fix core image env variable
2opremio Apr 18, 2024
26a0113
Bump SDK version
2opremio Apr 18, 2024
b818975
Stop using hashes for dependencies
2opremio Apr 18, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/setup-integration-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:

sudo wget -qO - https://apt.stellar.org/SDF.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true sudo apt-key add -
sudo bash -c 'echo "deb https://apt.stellar.org focal unstable" > /etc/apt/sources.list.d/SDF-unstable.list'
sudo apt-get update && sudo apt-get install -y stellar-core="$PROTOCOL_20_CORE_DEBIAN_PKG_VERSION"
sudo apt-get update && sudo apt-get install -y stellar-core="$CORE_DEBIAN_PKG_VERSION"
echo "Using stellar core version $(stellar-core version)"

# Docker-compose's remote contexts on Ubuntu 20 started failing with an OpenSSL versioning error.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soroban-rpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
env:
SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.2.0-1716.rc3.34d82fc00.focal
CORE_DEBIAN_PKG_VERSION: 20.4.1-1807.b152dc51d.focal
2opremio marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v3
with:
Expand Down
117 changes: 63 additions & 54 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ version = "20.3.5"
rust-version = "1.74.0"

[workspace.dependencies.soroban-env-host]
version = "=20.3.0"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da"
version = "=21.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "4d9b1020f7b5baa0f972eb08ed8aa2cd3343ad7c"
# path = "../rs-soroban-env/soroban-env-host"

[workspace.dependencies.soroban-simulation]
version = "=20.3.0"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "8c9ab83c406bd86f56d52eae3e39dccf6b45b3da"
version = "=21.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "4d9b1020f7b5baa0f972eb08ed8aa2cd3343ad7c"
# path = "../rs-soroban-env/soroban-simulation"

[workspace.dependencies.soroban-spec]
version = "=20.5.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "476a47180e59213c4d2d4041a3af7684f601db43"
# path = "../rs-soroban-sdk/soroban-spec"

[workspace.dependencies.soroban-spec-rust]
version = "=20.5.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "476a47180e59213c4d2d4041a3af7684f601db43"
# path = "../rs-soroban-sdk/soroban-spec-rust"

[workspace.dependencies.soroban-spec-json]
Expand All @@ -47,8 +47,8 @@ rev = "a59f5f421a27bab71472041fc619dd8b0d1cf902"

[workspace.dependencies.soroban-sdk]
version = "=20.5.0"
# git = "https://github.com/stellar/rs-soroban-sdk"
# rev = "89efc3c211d41f1ab143bed0a09cd6af353bb098"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "476a47180e59213c4d2d4041a3af7684f601db43"

[workspace.dependencies.soroban-token-sdk]
version = "=20.3.2"
Expand All @@ -67,6 +67,8 @@ path = "cmd/crates/stellar-rpc-client"
[workspace.dependencies.stellar-xdr]
version = "=20.1.0"
default-features = true
git = "https://github.com/stellar/rs-stellar-xdr"
rev = "a80c899c61e869fd00b7b475a4947ab6aaf9dcac"

[workspace.dependencies]
stellar-strkey = "0.0.7"
Expand Down
Loading
Loading