Skip to content

Commit 59ff22d

Browse files
committed
Re-enable checkXDRFileIdentity and update p28 dep tree
The XDR identity check was commented out pending the p28 bump; this commit does that bump, so re-enable it. p28-expect.txt picks up the new stellar-xdr rev from the host repin. The only change is the rev itself, in both places it appears; p21-p27 are untouched.
1 parent 0617d57 commit 59ff22d

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

src/main/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,12 +428,7 @@ main(int argc, char* const* argv)
428428
Config::CURRENT_LEDGER_PROTOCOL_VERSION);
429429

430430
#ifndef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
431-
// Disable the XDR check temporarily until p28 bump. Due to imperfect
432-
// check mechanism, vCurr XDR has 'diverged' from p27 host XDR because
433-
// we've moved some definitions around (even though there were no
434-
// semantic changes).
435-
// When we bump Core to p28, we should re-enable this check.
436-
// checkXDRFileIdentity();
431+
checkXDRFileIdentity();
437432
#endif
438433
}
439434
catch (...)

src/rust/src/dep-trees/p28-expect.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ soroban-env-host v28.0.0 (src/rust/soroban/p28/soroban-env-host)
259259
│ │ │ ├── itoa v1.0.6
260260
│ │ │ ├── ryu v1.0.13
261261
│ │ │ └── serde v1.0.192 (*)
262-
│ │ ├── stellar-xdr v27.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=a90de0c0d6eba8be668e9074cfb7b285ac0ecd34#a90de0c0)
262+
│ │ ├── stellar-xdr v27.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=3305b3e31f19fdb4e64e4b7a4354bb120cdf4415#3305b3e3)
263263
│ │ │ ├── escape-bytes v0.1.1
264264
│ │ │ ├── ethnum v1.5.3
265265
│ │ │ ├── hex v0.4.3
@@ -289,7 +289,7 @@ soroban-env-host v28.0.0 (src/rust/soroban/p28/soroban-env-host)
289289
│ │ └── wasmparser-nostd v0.100.2
290290
│ │ └── indexmap-nostd v0.4.0
291291
│ ├── static_assertions v1.1.0
292-
│ ├── stellar-xdr v27.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=a90de0c0d6eba8be668e9074cfb7b285ac0ecd34#a90de0c0)
292+
│ ├── stellar-xdr v27.0.0 (https://github.com/stellar/rs-stellar-xdr?rev=3305b3e31f19fdb4e64e4b7a4354bb120cdf4415#3305b3e3)
293293
│ │ ├── base64 v0.22.1
294294
│ │ ├── escape-bytes v0.1.1
295295
│ │ ├── ethnum v1.5.3

0 commit comments

Comments
 (0)