Skip to content

Commit

Permalink
Bump core to env v22.0.0 commit and fix build (#4537)
Browse files Browse the repository at this point in the history
# Description

Bump core to env v22.0.0 commit and fix build

<!---

Describe what this pull request does, which issue it's resolving
(usually applicable for code changes).

--->

# Checklist
- [ ] Reviewed the
[contributing](https://github.com/stellar/stellar-core/blob/master/CONTRIBUTING.md#submitting-changes)
document
- [ ] Rebased on top of master (no merge commits)
- [ ] Ran `clang-format` v8.0.0 (via `make format` or the Visual Studio
extension)
- [ ] Compiles
- [ ] Ran all tests
- [ ] If change impacts performance, include supporting evidence per the
[performance
document](https://github.com/stellar/stellar-core/blob/master/performance-eval/performance-eval.md)
  • Loading branch information
sisuresh authored Nov 6, 2024
2 parents 2a1d084 + 9ac278a commit 7023383
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/ledger/NetworkConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,9 @@ SorobanNetworkConfig::initializeGenesisLedgerForTesting(
// Protocol 20 released with somewhat incorrect costs and has been
// re-calibrated short after the release. We catch up here to the more
// correct costs that exist on the network.
#ifdef BUILD_TESTS
updateRecalibratedCostTypesForV20(ltx);
#endif
ltx.loadHeader().current().ledgerVersion = genesisLedgerProtocol;
}

Expand Down
12 changes: 6 additions & 6 deletions src/rust/src/dep-trees/p22-expect.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
soroban-env-host v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-host)
soroban-env-host v22.0.0 (src/rust/soroban/p22/soroban-env-host)
├── ark-bls12-381 v0.4.0
│ ├── ark-ec v0.4.2
│ │ ├── ark-ff v0.4.2
Expand Down Expand Up @@ -222,17 +222,17 @@ soroban-env-host v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-host)
│ ├── digest v0.10.7 (*)
│ └── keccak v0.1.4
│ └── cpufeatures v0.2.8 (*)
├── soroban-builtin-sdk-macros v22.0.0-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
├── soroban-builtin-sdk-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-builtin-sdk-macros)
│ ├── itertools v0.10.5
│ │ └── either v1.8.1
│ ├── proc-macro2 v1.0.69 (*)
│ ├── quote v1.0.33 (*)
│ └── syn v2.0.39 (*)
├── soroban-env-common v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-common)
├── soroban-env-common v22.0.0 (src/rust/soroban/p22/soroban-env-common)
│ ├── ethnum v1.5.0
│ ├── num-derive v0.4.1 (proc-macro) (*)
│ ├── num-traits v0.2.17 (*)
│ ├── soroban-env-macros v22.0.0-rc.3 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
│ ├── soroban-env-macros v22.0.0 (proc-macro) (src/rust/soroban/p22/soroban-env-macros)
│ │ ├── itertools v0.10.5 (*)
│ │ ├── proc-macro2 v1.0.69 (*)
│ │ ├── quote v1.0.33 (*)
Expand All @@ -245,7 +245,7 @@ soroban-env-host v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-host)
│ │ │ ├── itoa v1.0.6
│ │ │ ├── ryu v1.0.13
│ │ │ └── serde v1.0.192 (*)
│ │ ├── stellar-xdr v22.0.0-rc.1.1
│ │ ├── stellar-xdr v22.0.0
│ │ │ ├── escape-bytes v0.1.1
│ │ │ ├── hex v0.4.3
│ │ │ └── stellar-strkey v0.0.9
Expand Down Expand Up @@ -275,7 +275,7 @@ soroban-env-host v22.0.0-rc.3 (src/rust/soroban/p22/soroban-env-host)
│ │ └── wasmparser-nostd v0.100.2
│ │ └── indexmap-nostd v0.4.0
│ ├── static_assertions v1.1.0
│ ├── stellar-xdr v22.0.0-rc.1.1
│ ├── stellar-xdr v22.0.0
│ │ ├── base64 v0.13.1
│ │ ├── escape-bytes v0.1.1
│ │ ├── hex v0.4.3
Expand Down

0 comments on commit 7023383

Please sign in to comment.