Pick up protocol 21 (#1252)

### What Update env to pick up protocol 21. Fix breakage due to the `SnapshotSource` interface change. ### Why [TODO: Why this change is being made. Include any context required to understand the why.] ### Known limitations [TODO or N/A]
stellar · Apr 12, 2024 · 476a471 · 476a471
1 parent 9ea5328
commit 476a471
Show file tree

Hide file tree

Showing 105 changed files with 134 additions and 142 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,19 +41,19 @@ soroban-ledger-snapshot = { version = "20.5.0", path = "soroban-ledger-snapshot"
 soroban-token-sdk = { version = "20.5.0", path = "soroban-token-sdk" }
 
 [workspace.dependencies.soroban-env-common]
-version = "=20.3.0"
+version = "=21.0.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
+rev = "4d9b1020f7b5baa0f972eb08ed8aa2cd3343ad7c"
 
 [workspace.dependencies.soroban-env-guest]
-version = "=20.3.0"
+version = "=21.0.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
+rev = "4d9b1020f7b5baa0f972eb08ed8aa2cd3343ad7c"
 
 [workspace.dependencies.soroban-env-host]
-version = "=20.3.0"
+version = "=21.0.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "a8c713db03ba5ebfdc4786b73dcba00284e15dbe"
+rev = "4d9b1020f7b5baa0f972eb08ed8aa2cd3343ad7c"
 
 [workspace.dependencies.stellar-strkey]
 version = "=0.0.8"
@@ -63,7 +63,7 @@ version = "=20.1.0"
 default-features = false
 features = ["curr"]
 git = "https://github.com/stellar/rs-stellar-xdr"
-rev = "3a001b1fbb20e4cfa2cef2c0cc450564e8528057"
+rev = "a80c899c61e869fd00b7b475a4947ab6aaf9dcac"
 
 #[patch."https://github.com/stellar/rs-soroban-env"]
 #soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }

diff --git a/soroban-ledger-snapshot/src/lib.rs b/soroban-ledger-snapshot/src/lib.rs
@@ -8,7 +8,7 @@ use std::{
 
 use soroban_env_host::{
     storage::SnapshotSource,
-    xdr::{LedgerEntry, LedgerKey, ScError, ScErrorCode},
+    xdr::{LedgerEntry, LedgerKey},
     Host, HostError, LedgerInfo,
 };
 
@@ -182,22 +182,22 @@ impl Default for LedgerSnapshot {
 }
 
 impl SnapshotSource for &LedgerSnapshot {
-    fn get(&self, key: &Rc<LedgerKey>) -> Result<(Rc<LedgerEntry>, Option<u32>), HostError> {
+    fn get(
+        &self,
+        key: &Rc<LedgerKey>,
+    ) -> Result<Option<(Rc<LedgerEntry>, Option<u32>)>, HostError> {
         match self.ledger_entries.iter().find(|(k, _)| **k == **key) {
-            Some((_, v)) => Ok((Rc::new(*v.0.clone()), v.1)),
-            None => Err(ScError::Storage(ScErrorCode::MissingValue).into()),
+            Some((_, v)) => Ok(Some((Rc::new(*v.0.clone()), v.1))),
+            None => Ok(None),
         }
     }
-    fn has(&self, key: &Rc<LedgerKey>) -> Result<bool, HostError> {
-        Ok(self.ledger_entries.iter().any(|(k, _)| **k == **key))
-    }
 }
 
 impl SnapshotSource for LedgerSnapshot {
-    fn get(&self, key: &Rc<LedgerKey>) -> Result<(Rc<LedgerEntry>, Option<u32>), HostError> {
+    fn get(
+        &self,
+        key: &Rc<LedgerKey>,
+    ) -> Result<Option<(Rc<LedgerEntry>, Option<u32>)>, HostError> {
         <_ as SnapshotSource>::get(&self, key)
     }
-    fn has(&self, key: &Rc<LedgerKey>) -> Result<bool, HostError> {
-        <_ as SnapshotSource>::has(&self, key)
-    }
 }
diff --git a/soroban-sdk/src/env.rs b/soroban-sdk/src/env.rs
@@ -454,10 +454,7 @@ use soroban_ledger_snapshot::LedgerSnapshot;
 #[cfg(any(test, feature = "testutils"))]
 use std::{path::Path, rc::Rc};
 #[cfg(any(test, feature = "testutils"))]
-use xdr::{
-    LedgerEntry, LedgerKey, LedgerKeyContractData, ScErrorCode, ScErrorType,
-    SorobanAuthorizationEntry,
-};
+use xdr::{LedgerEntry, LedgerKey, LedgerKeyContractData, SorobanAuthorizationEntry};
 
 #[cfg(any(test, feature = "testutils"))]
 #[cfg_attr(feature = "docs", doc(cfg(feature = "testutils")))]
@@ -484,20 +481,15 @@ impl Env {
             fn get(
                 &self,
                 _key: &Rc<xdr::LedgerKey>,
-            ) -> Result<(Rc<xdr::LedgerEntry>, Option<u32>), soroban_env_host::HostError>
+            ) -> Result<Option<(Rc<xdr::LedgerEntry>, Option<u32>)>, soroban_env_host::HostError>
             {
-                let err: internal::Error = (ScErrorType::Storage, ScErrorCode::MissingValue).into();
-                Err(err.into())
-            }
-
-            fn has(&self, _key: &Rc<xdr::LedgerKey>) -> Result<bool, soroban_env_host::HostError> {
-                Ok(false)
+                Ok(None)
             }
         }
 
         let rf = Rc::new(EmptySnapshotSource());
         let info = internal::LedgerInfo {
-            protocol_version: 20,
+            protocol_version: 21,
             sequence_number: 0,
             timestamp: 0,
             network_id: [0; 32],

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_first_unchecked_panics.1.json b/soroban-sdk/test_snapshots/bytes/test/test_first_unchecked_panics.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_get_unchecked_panics.1.json b/soroban-sdk/test_snapshots/bytes/test/test_get_unchecked_panics.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_insert_panic.1.json b/soroban-sdk/test_snapshots/bytes/test/test_insert_panic.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_last_unchecked_panics.1.json b/soroban-sdk/test_snapshots/bytes/test/test_last_unchecked_panics.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_pop_unchecked_panics.1.json b/soroban-sdk/test_snapshots/bytes/test/test_pop_unchecked_panics.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_remove_unchecked_panics.1.json b/soroban-sdk/test_snapshots/bytes/test/test_remove_unchecked_panics.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/bytes/test/test_slice_panic.1.json b/soroban-sdk/test_snapshots/bytes/test/test_slice_panic.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/map/test/test_get_unchecked_panics_on_key_type_mismatch.1.json b/soroban-sdk/test_snapshots/map/test/test_get_unchecked_panics_on_key_type_mismatch.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/map/test/test_remove_unchecked_panic.1.json b/soroban-sdk/test_snapshots/map/test/test_remove_unchecked_panic.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/...ban-sdk/test_snapshots/map/test/test_try_get_unchecked_panics_on_key_type_mismatch.1.json b/...ban-sdk/test_snapshots/map/test/test_try_get_unchecked_panics_on_key_type_mismatch.1.json
@@ -5,7 +5,7 @@
   },
   "auth": [],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_10_one/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_10_one/test.1.json
@@ -56,7 +56,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_15_one_repeat/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_15_one_repeat/test.1.json
@@ -54,7 +54,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_17_no_consume_requirement/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_17_no_consume_requirement/test.1.json
@@ -31,7 +31,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_20_deep_one_address/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_20_deep_one_address/test.1.json
@@ -25,7 +25,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_20_deep_one_address/test_auth_tree.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_20_deep_one_address/test_auth_tree.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_30_deep_one_address_repeat/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_30_deep_one_address_repeat/test.1.json
@@ -42,7 +42,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_30_deep_one_address_repeat/test_auth_tree.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_30_deep_one_address_repeat/test_auth_tree.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_35_deep_one_address_repeat_grouped/test.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_35_deep_one_address_repeat_grouped/test.1.json
@@ -42,7 +42,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/...k/test_snapshots/tests/auth/auth_35_deep_one_address_repeat_grouped/test_auth_tree.1.json b/...k/test_snapshots/tests/auth/auth_35_deep_one_address_repeat_grouped/test_auth_tree.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/auth/auth_40_multi_one_address/test_auth_as_tree.1.json b/soroban-sdk/test_snapshots/tests/auth/auth_40_multi_one_address/test_auth_as_tree.1.json
@@ -40,7 +40,7 @@
     ]
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/...ots/tests/auth/auth_40_multi_one_address/test_auth_not_allowed_with_separated_tree.1.json b/...ots/tests/auth/auth_40_multi_one_address/test_auth_not_allowed_with_separated_tree.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/budget/test_budget.1.json b/soroban-sdk/test_snapshots/tests/budget/test_budget.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/contract_add_i32/test_functional.1.json b/soroban-sdk/test_snapshots/tests/contract_add_i32/test_functional.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",

diff --git a/soroban-sdk/test_snapshots/tests/contract_assert/test_invoke_expect_error.1.json b/soroban-sdk/test_snapshots/tests/contract_assert/test_invoke_expect_error.1.json
@@ -7,7 +7,7 @@
     []
   ],
   "ledger": {
-    "protocol_version": 20,
+    "protocol_version": 21,
     "sequence_number": 0,
     "timestamp": 0,
     "network_id": "0000000000000000000000000000000000000000000000000000000000000000",