Merge branch 'main' into cli/restore-preamble

stellar · Aug 31, 2023 · 528c3fb · 528c3fb
2 parents 0a12309 + 15b4f6e
commit 528c3fb
Show file tree

Hide file tree

Showing 39 changed files with 216 additions and 187 deletions.
diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -110,7 +110,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: 19.13.1-1434.35170ec6c.focal~soroban
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1458.431e4e324.focal~soroban~settings~override
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,18 +16,18 @@ version = "0.9.4"
 [workspace.dependencies.soroban-env-host]
 version = "0.0.17"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "048be90e10dfda6486141f96ea86e32fb91681f4"
+rev = "ee3896617f5eeb06d6346e2fbf70cb44d0823b27"
 
 [workspace.dependencies.soroban-spec]
 version = "0.9.1"
-git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "df9334d4e3a1a2c2e0034cfabb643972d4d7f717"
+git = "https://github.com/sisuresh/rs-soroban-sdk"
+rev = "e15e552974a1070fc48027384bdee9ae9f539943"
 # path = "../rs-soroban-sdk/soroban-spec"
 
 [workspace.dependencies.soroban-spec-rust]
 version = "0.9.1"
-git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "df9334d4e3a1a2c2e0034cfabb643972d4d7f717"
+git = "https://github.com/sisuresh/rs-soroban-sdk"
+rev = "e15e552974a1070fc48027384bdee9ae9f539943"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
@@ -44,13 +44,13 @@ path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
 version = "0.9.1"
-git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "df9334d4e3a1a2c2e0034cfabb643972d4d7f717"
+git = "https://github.com/sisuresh/rs-soroban-sdk"
+rev = "e15e552974a1070fc48027384bdee9ae9f539943"
 
 [workspace.dependencies.soroban-ledger-snapshot]
 version = "0.9.1"
-git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "df9334d4e3a1a2c2e0034cfabb643972d4d7f717"
+git = "https://github.com/sisuresh/rs-soroban-sdk"
+rev = "e15e552974a1070fc48027384bdee9ae9f539943"
 
 [workspace.dependencies.soroban-cli]
 version = "0.9.4"
@@ -59,7 +59,7 @@ path = "cmd/soroban-cli"
 [workspace.dependencies.stellar-xdr]
 version = "0.0.17"
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "4876e5eb20016caebbd13bcf6401626dc6073b8e"
+rev = "e2a9cbf72d94941de1bde6ba34a38e1f49328567"
 default-features = false
 
 [workspace.dependencies]

diff --git a/cmd/crates/soroban-spec-json/src/lib.rs b/cmd/crates/soroban-spec-json/src/lib.rs
@@ -56,6 +56,8 @@ pub fn generate_from_wasm(wasm: &[u8]) -> Result<String, FromWasmError> {
 }
 
 /// # Panics
+///
+/// If `serde_json::to_string_pretty` fails to serialize the spec entries.
 pub fn generate(spec: &[ScSpecEntry]) -> String {
     let collected: Vec<_> = spec.iter().map(Entry::from).collect();
     serde_json::to_string_pretty(&collected).expect("serialization of the spec entries should not have any failure cases as all keys are strings and the serialize implementations are derived")