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

Bump env curr and prev #4153

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Bump env curr and prev #4153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81b366c
Bump env curr and prev
sisuresh Jan 22, 2024
7eaff77
Fix docs
sisuresh Jan 22, 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
108 changes: 34 additions & 74 deletions Cargo.lock
View file
Open in desktop

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

11 changes: 6 additions & 5 deletions docs/versioning.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ Upgrades are specified with:
* protocolversion - upgrades value of ledgerVersion in ledger header, uses
upgrade type LEDGER_UPGRADE_VERSION (when specified it has to match the
supported version number)
* configupgradesetkey - this key will be converted to a ContractData LedgerKey, and the
ContractData LedgerEntry retrieved with that will have a val of SCV_BYTES
containing a serialized ConfigUpgradeSet. Each ConfigSettingEntry in the
ConfigUpgradeSet will be used to update the existing network ConfigSettingEntry
that exists at the corresponding CONFIG_SETTING LedgerKey.
* configupgradesetkey - this is a serialized ConfigUpgradeSetKey, which contains
a ContractData LedgerKey and a contractID. The ContractData LedgerEntry
retrieved with that will have a val of SCV_BYTES containing a serialized
ConfigUpgradeSet. Each ConfigSettingEntry in the ConfigUpgradeSet will be used
to update the existing network ConfigSettingEntry that exists at the
corresponding CONFIG_SETTING LedgerKey.

#### Limitations of the current implementation
There is an assumption that validator operators are either paying attention to network wide proposals
Expand Down
10 changes: 5 additions & 5 deletions src/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ itertools = "=0.11.0"
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "b6ef8e32d86b008b2ecfdb2d7ca958e751190523"
rev = "e6b597c20aeda9963798a74b14ec1dd51c3a72e0"

# This copy of the soroban host is _optional_ and only enabled during protocol
# transitions. When transitioning from protocol N to N+1, the `curr` copy
Expand All @@ -57,20 +57,20 @@ rev = "b6ef8e32d86b008b2ecfdb2d7ca958e751190523"

[dependencies.soroban-env-host-prev]
optional = true
version = "=20.0.0-rc2"
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
package = "soroban-env-host"
rev = "bed170cde09a53c85ae2e02f9278ef0dfa4e0900"
rev = "b6ef8e32d86b008b2ecfdb2d7ca958e751190523"

[dependencies.soroban-test-wasms]
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "b6ef8e32d86b008b2ecfdb2d7ca958e751190523"
rev = "e6b597c20aeda9963798a74b14ec1dd51c3a72e0"

[dependencies.soroban-synth-wasm]
version = "=20.1.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "b6ef8e32d86b008b2ecfdb2d7ca958e751190523"
rev = "e6b597c20aeda9963798a74b14ec1dd51c3a72e0"

[dependencies.cargo-lock]
version = "=9.0.0"
Expand Down
8 changes: 4 additions & 4 deletions src/rust/src/host-dep-tree-curr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
soroban-env-host 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e32d86b008b2ecfdb2d7ca958e751190523#b6ef8e32d86b008b2ecfdb2d7ca958e751190523
soroban-env-host 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=e6b597c20aeda9963798a74b14ec1dd51c3a72e0#e6b597c20aeda9963798a74b14ec1dd51c3a72e0
├── tracy-client 0.15.2 checksum:434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608
│ ├── tracy-client-sys 0.20.0 checksum:e8cf8aeb20e40d13be65a0b134f8d82d360e72b2793a11de8867d7fbc0f9d6f6
│ │ └── cc 1.0.79 checksum:50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f
Expand Down Expand Up @@ -97,7 +97,7 @@ soroban-env-host 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e
│ ├── wasmi_arena 0.4.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ ├── spin 0.9.8 checksum:6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
│ └── smallvec 1.10.0 checksum:a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
├── soroban-env-common 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e32d86b008b2ecfdb2d7ca958e751190523#b6ef8e32d86b008b2ecfdb2d7ca958e751190523
├── soroban-env-common 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=e6b597c20aeda9963798a74b14ec1dd51c3a72e0#e6b597c20aeda9963798a74b14ec1dd51c3a72e0
│ ├── tracy-client 0.15.2 checksum:434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608
│ ├── stellar-xdr 20.0.2 checksum:e9f00a85bd9b1617d4cb7e741733889c9940e6bdeca360db81752b0ef04fe3a5
│ │ ├── stellar-strkey 0.0.8 checksum:12d2bf45e114117ea91d820a846fd1afbe3ba7d717988fee094ce8227a3bf8bd
Expand All @@ -107,7 +107,7 @@ soroban-env-host 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e
│ │ └── base64 0.13.1 checksum:9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
│ ├── static_assertions 1.1.0 checksum:a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
│ ├── soroban-wasmi 0.31.1-soroban.20.0.0 git+https://github.com/stellar/wasmi?rev=ab29800224d85ee64d4ac127bac84cdbb0276721#ab29800224d85ee64d4ac127bac84cdbb0276721
│ ├── soroban-env-macros 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e32d86b008b2ecfdb2d7ca958e751190523#b6ef8e32d86b008b2ecfdb2d7ca958e751190523
│ ├── soroban-env-macros 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=e6b597c20aeda9963798a74b14ec1dd51c3a72e0#e6b597c20aeda9963798a74b14ec1dd51c3a72e0
│ │ ├── syn 2.0.39 checksum:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
│ │ ├── stellar-xdr 20.0.2 checksum:e9f00a85bd9b1617d4cb7e741733889c9940e6bdeca360db81752b0ef04fe3a5
│ │ ├── serde_json 1.0.108 checksum:3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b
Expand All @@ -123,7 +123,7 @@ soroban-env-host 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e
│ │ └── proc-macro2 1.0.69 checksum:134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
│ ├── ethnum 1.5.0 checksum:b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c
│ └── crate-git-revision 0.0.6 checksum:c521bf1f43d31ed2f73441775ed31935d77901cb3451e44b38a1c1612fcbaf98
├── soroban-builtin-sdk-macros 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=b6ef8e32d86b008b2ecfdb2d7ca958e751190523#b6ef8e32d86b008b2ecfdb2d7ca958e751190523
├── soroban-builtin-sdk-macros 20.1.0 git+https://github.com/stellar/rs-soroban-env?rev=e6b597c20aeda9963798a74b14ec1dd51c3a72e0#e6b597c20aeda9963798a74b14ec1dd51c3a72e0
│ ├── syn 2.0.39 checksum:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
│ ├── quote 1.0.33 checksum:5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
│ ├── proc-macro2 1.0.69 checksum:134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da
Expand Down
Loading