-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit removes all blobs from state and makes use of protocol input data semantics. This approach lowers storage costs by ~100x.
- Loading branch information
dndll
committed
Sep 21, 2023
1 parent
7d6d037
commit 04b5d08
Showing
12 changed files
with
251 additions
and
516 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -15,7 +15,8 @@ authors = ["Pagoda <[email protected]>"] | |
| edition = "2021" | ||
|
|
||
| [workspace] | ||
| members = ["crates/*", "contracts/*", "bin/*", "op-stack/optimism-rs"] | ||
| members = ["crates/*", "contracts/*", "bin/*" ] | ||
| # TODO: ignored for now "op-stack/optimism-rs" | ||
| resolver = "2" | ||
|
|
||
| [workspace.dependencies] | ||
|
|
||
This file contains 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
Submodule light-client
updated
8 files
| +12 −5 | Cargo.toml | |
| +5 −4 | default.toml | |
| +1 −0 | src/config.rs | |
| +94 −2 | src/controller.rs | |
| +125 −19 | src/erasure.rs | |
| +190 −0 | src/erasure/commit.rs | |
| +13 −1 | src/main.rs | |
| +4,163 −0 | trusted-setup |
This file contains 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,182 +1,41 @@ | ||
| use near_da_primitives::{Blob as ExternalBlob, Namespace, ShareVersion}; | ||
| use near_sdk::{ | ||
| borsh::{self, BorshDeserialize, BorshSerialize}, | ||
| store::{LookupMap, UnorderedMap}, | ||
| BlockHeight, | ||
| }; | ||
| use near_da_primitives::Blob; | ||
| use near_sdk::{borsh, borsh::BorshDeserialize, borsh::BorshSerialize, BlockHeight}; | ||
| use near_sdk::{env, near_bindgen}; | ||
| use near_sdk_contract_tools::owner::OwnerExternal; | ||
| use near_sdk_contract_tools::{owner::Owner, Owner}; | ||
| use std::default; | ||
| use std::vec::Vec; | ||
| use std::{collections::HashMap, default}; | ||
|
|
||
| type Commitment = [u8; 32]; | ||
| #[allow(unused_imports)] // Justification: Proc macro needs this | ||
| use near_sdk_contract_tools::owner::OwnerExternal; | ||
|
|
||
| #[near_bindgen] | ||
| #[derive(Owner, BorshDeserialize, BorshSerialize)] | ||
| pub struct Contract { | ||
| pub blobs: UnorderedMap<Commitment, Blob>, | ||
| pub indices: LookupMap<Namespace, HashMap<BlockHeight, Commitment>>, | ||
| } | ||
| pub struct Contract {} | ||
|
|
||
| impl default::Default for Contract { | ||
| fn default() -> Self { | ||
| let mut contract = Self { | ||
| indices: LookupMap::new(b"i".to_vec()), | ||
| blobs: UnorderedMap::new(b"b"), | ||
| }; | ||
| let mut contract = Self {}; | ||
| Owner::init(&mut contract, &near_sdk::env::predecessor_account_id()); | ||
|
|
||
| contract | ||
| } | ||
| } | ||
|
|
||
| #[derive(BorshDeserialize, BorshSerialize, Clone)] | ||
| pub struct Blob { | ||
| data: Vec<u8>, | ||
| // Keep track of these to make sure there are no breaking changes which | ||
| // might bork the store | ||
| share_version: ShareVersion, | ||
| } | ||
|
|
||
| impl TryFrom<ExternalBlob> for Blob { | ||
| type Error = (); | ||
| fn try_from(value: ExternalBlob) -> Result<Self, Self::Error> { | ||
| Ok(Blob { | ||
| data: value.data.try_to_vec().map_err(|_| ())?, | ||
| share_version: value.share_version, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| #[near_bindgen] | ||
| impl Contract { | ||
| pub fn submit(&mut self, blobs: Vec<ExternalBlob>) -> BlockHeight { | ||
| pub fn submit(&mut self, blobs: Vec<Blob>) -> BlockHeight { | ||
| Self::require_owner(); | ||
|
|
||
| let height = env::block_height(); | ||
|
|
||
| for blob in blobs { | ||
| let map = self | ||
| .indices | ||
| .entry(blob.namespace.clone()) | ||
| .or_insert(HashMap::default()); | ||
| let commitment = blob.commitment; | ||
| map.insert(height, blob.commitment); | ||
| let blob: Result<Blob, _> = blob.try_into(); | ||
| if let Ok(blob) = blob { | ||
| self.blobs.insert(commitment, blob); | ||
| } else { | ||
| return 0; | ||
| } | ||
| } | ||
| height | ||
| } | ||
| pub fn clear(&mut self, ns: Vec<Namespace>) { | ||
| Self::require_owner(); | ||
|
|
||
| for ns in ns { | ||
| let inner = self.indices.get_mut(&ns); | ||
| if let Some(inner) = inner { | ||
| inner.iter().for_each(|(_, commitment)| { | ||
| self.blobs.remove(commitment); | ||
| }); | ||
| } | ||
| self.indices.remove(&ns); | ||
| } | ||
| } | ||
|
|
||
| pub fn get(&self, namespace: Namespace, height: BlockHeight) -> Option<ExternalBlob> { | ||
| self.indices | ||
| .get(&namespace) | ||
| .and_then(|x| x.get(&height)) | ||
| .and_then(|commitment| self.blobs.get(commitment).map(|x| (commitment, x))) | ||
| .and_then(|(commitment, inner)| { | ||
| Some(ExternalBlob { | ||
| namespace, | ||
| data: BorshDeserialize::try_from_slice(&inner.data).ok()?, | ||
| share_version: inner.share_version, | ||
| commitment: commitment.clone(), | ||
| }) | ||
| }) | ||
| .clone() | ||
| } | ||
|
|
||
| pub fn get_all(&self, namespace: Namespace) -> Vec<(BlockHeight, ExternalBlob)> { | ||
| self.indices | ||
| .get(&namespace) | ||
| .map(|height_map| { | ||
| height_map | ||
| .iter() | ||
| .flat_map(|(height, commitment)| { | ||
| self.blobs.get(commitment).map(|x| (height, commitment, x)) | ||
| }) | ||
| .flat_map(|(height, commitment, inner)| { | ||
| Some(( | ||
| *height, | ||
| ExternalBlob { | ||
| namespace, | ||
| data: BorshDeserialize::try_from_slice(&inner.data).ok()?, | ||
| share_version: inner.share_version, | ||
| commitment: commitment.clone(), | ||
| }, | ||
| )) | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| }) | ||
| .unwrap_or_default() | ||
| } | ||
|
|
||
| // Shortcut read if you already know the namespace of the commitment | ||
| pub fn fast_get(&self, commitment: Commitment) -> Option<ExternalBlob> { | ||
| self.blobs.get(&commitment).and_then(|inner| { | ||
| Some(ExternalBlob { | ||
| namespace: Namespace::default(), | ||
| data: BorshDeserialize::try_from_slice(&inner.data).ok()?, | ||
| share_version: inner.share_version, | ||
| commitment: commitment.clone(), | ||
| }) | ||
| }) | ||
| near_sdk::env::log_str(&format!("submitting {} blobs", blobs.len())); | ||
| env::block_height() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| fn dummy_blob() -> ExternalBlob { | ||
| ExternalBlob { | ||
| namespace: Namespace::new(1, 1), | ||
| data: "fake".try_to_vec().unwrap(), | ||
| share_version: 1, | ||
| commitment: [2_u8; 32], | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn initializes() { | ||
| let _ = Contract::default(); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_submit_indices() { | ||
| let mut contract = Contract::default(); | ||
| let blobs = vec![dummy_blob()]; | ||
| let height = contract.submit(blobs.clone()); | ||
| assert_eq!(height, 0); | ||
| assert_eq!(contract.blobs.len(), 1); | ||
| let height_commitment = contract.indices.get(&blobs[0].namespace).unwrap(); | ||
| assert_eq!(height_commitment.len(), 1); | ||
| assert_eq!(height_commitment.get(&0).unwrap(), &[2_u8; 32]); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_remove() { | ||
| let mut contract = Contract::default(); | ||
| let blobs = vec![dummy_blob()]; | ||
| contract.submit(blobs.clone()); | ||
| contract.clear(vec![blobs[0].namespace]); | ||
| assert_eq!(contract.blobs.len(), 0); | ||
| assert!(contract.indices.get(&blobs[0].namespace).is_none()); | ||
| } | ||
| } |
This file contains 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.