Add external read-only contract storage access #1691
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,81 @@ | ||
| use crate::{ | ||
| storage::InstanceStorageMap, | ||
| xdr::{LedgerEntryData, ScErrorCode, ScErrorType}, | ||
| AddressObject, Host, HostError, StorageType, Val, | ||
| }; | ||
|
|
||
| impl Host { | ||
| fn contract_data_entry_value(&self, entry: &LedgerEntryData) -> Result<Val, HostError> { | ||
| match entry { | ||
| LedgerEntryData::ContractData(e) => self.to_valid_host_val(&e.val), | ||
| _ => Err(self.err( | ||
| ScErrorType::Storage, | ||
| ScErrorCode::InternalError, | ||
| "expected contract data ledger entry", | ||
| &[], | ||
| )), | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn try_get_contract_data_value( | ||
| &self, | ||
| k: Val, | ||
| t: StorageType, | ||
| ) -> Result<Option<Val>, HostError> { | ||
| match t { | ||
| StorageType::Temporary | StorageType::Persistent => { | ||
| let key = self.storage_key_from_val(k, t.try_into()?)?; | ||
| let entry = self | ||
| .try_borrow_storage_mut()? | ||
| .try_get(&key, self, Some(k))?; | ||
| entry | ||
| .map(|entry| self.contract_data_entry_value(&entry.data)) | ||
| .transpose() | ||
| } | ||
| StorageType::Instance => { | ||
| self.with_instance_storage(|s| s.map.get(&k, self).map(|v| v.copied())) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn try_get_external_contract_data_value( | ||
| &self, | ||
| contract: AddressObject, | ||
| k: Val, | ||
| t: StorageType, | ||
| ) -> Result<Option<Val>, HostError> { | ||
| match t { | ||
| StorageType::Temporary | StorageType::Persistent => { | ||
| let key = self.storage_key_from_address_val(contract, k, t.try_into()?)?; | ||
| let entry = self | ||
| .try_borrow_storage_mut()? | ||
| .try_get(&key, self, Some(k))?; | ||
| entry | ||
| .map(|entry| self.contract_data_entry_value(&entry.data)) | ||
| .transpose() | ||
| } | ||
| StorageType::Instance => self.try_get_external_instance_data_value(contract, k), | ||
| } | ||
| } | ||
|
Comment on lines
+20
to
+59
|
||
|
|
||
| fn try_get_external_instance_data_value( | ||
| &self, | ||
| contract: AddressObject, | ||
| k: Val, | ||
| ) -> Result<Option<Val>, HostError> { | ||
| let contract_id = self.contract_id_from_address(contract)?; | ||
| let instance_key = self.contract_instance_ledger_key(&contract_id)?; | ||
| let entry = self | ||
| .try_borrow_storage_mut()? | ||
| .try_get(&instance_key, self, None)?; | ||
|
Comment on lines
+68
to
+70
There was a problem hiding this comment.
When Useful? React with 👍 / 👎. |
||
| let Some(entry) = entry else { | ||
| return Ok(None); | ||
| }; | ||
| let instance = self.extract_contract_instance_from_ledger_entry(&entry)?; | ||
| let instance_storage = InstanceStorageMap::from_instance_xdr(&instance, self)?; | ||
| instance_storage | ||
| .map | ||
| .get(&k, self) | ||
| .map(|value| value.copied()) | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This interface is rather awkward and inconsistent with the existing storage functions. I think we should either:
try_function implementationtry_function saves us a lot of instructions vs has + get, then we should return an 'option' value from the function instead of writing the output to linear memory. But I really think just dropping this is easier and not significantly more expensive.