refactor: zero copy vec #1469
Merged
refactor: zero copy vec #1469
Conversation
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
ananas-block
force-pushed
the
jorrit/experiment-zerocopy-vec
branch
3 times, most recently
from
7c38f05 to
5e0c6de
Compare
|
|
||
| /// `ZeroCopyVec` is a custom vector implementation which forbids | ||
| /// post-initialization reallocations. The size is not known during compile | ||
| /// time (that makes it different from arrays), but can be defined only once | ||
| /// (that makes it different from [`Vec`](std::vec::Vec)). | ||
| pub struct ZeroCopyVec<LEN, T> | ||
| pub struct ZeroCopyVec<'a, L, T, const PAD: bool = true> |
There was a problem hiding this comment.
Suggested change
| pub struct ZeroCopyVec<'a, L, T, const PAD: bool = true> | |
| #[repr(C)] | |
| pub struct ZeroCopyVec<'a, L, T, const PAD: bool = true> |
There was a problem hiding this comment.
removed all #[repr(C)] in this crate since the structs ZeroCopySliceMut, ZeroCopyVec, and ZeroCopyCyclicVec are not saved in bytes but just contain references in runtime.
zerocopy::Ref doesn't derive #[repr(C)] either see docs.
ananas-block
commented
Jan 10, 2025
ananas-block
commented
Jan 10, 2025
ananas-block
commented
Jan 10, 2025
ananas-block
commented
Jan 10, 2025
ananas-block
commented
Jan 10, 2025
ananas-block
force-pushed
the
jorrit/experiment-zerocopy-vec
branch
2 times, most recently
from
f2ce3e8 to
3f216d8
Compare
ananas-block
force-pushed
the
jorrit/experiment-zerocopy-vec
branch
from
3f216d8 to
c3f5680
Compare
ananas-block
force-pushed
the
jorrit/experiment-zerocopy-vec
branch
from
b950843 to
63e0a85
Compare
ananas-block
force-pushed
the
jorrit/experiment-zerocopy-vec
branch
from
63e0a85 to
8dcceea
Compare
Comment on lines
+525
to
+542
| // // 15. functional - proof by index for account which is invalidated in the same tx | ||
| // { | ||
| // perform_create_pda_with_event( | ||
| // &mut e2e_env.indexer, | ||
| // &mut e2e_env.rpc, | ||
| // &env, | ||
| // &payer, | ||
| // seed, | ||
| // &data, | ||
| // &ID, | ||
| // None, | ||
| // Some(vec![account_in_value_array.clone()]), | ||
| // CreatePdaMode::ReadOnlyProofOfInsertedAccount, | ||
| // ) | ||
| // .await | ||
| // .unwrap(); | ||
| // } | ||
| println!("post 15"); |
Comment on lines
+624
to
+689
| // Doesn't yield the expected result due to unclean test setup | ||
| // // 18. functional - 1 read only account by zkp 3 regular inputs && failing - zkp for invalidated account | ||
| // { | ||
| // let seed = [254u8; 32]; | ||
| // let data = [5u8; 31]; | ||
| // let mut input_accounts = Vec::new(); | ||
| // let compressed_accounts = e2e_env.indexer.get_compressed_accounts_by_owner(&ID); | ||
| // for i in 0..100 { | ||
| // let input_account_in_mt = compressed_accounts.iter().find(|x| { | ||
| // x.merkle_context.leaf_index == i | ||
| // && x.merkle_context.merkle_tree_pubkey == env.batched_state_merkle_tree | ||
| // && x.merkle_context.leaf_index | ||
| // != account_not_in_value_array_and_in_mt | ||
| // .merkle_context | ||
| // .leaf_index | ||
| // }); | ||
| // if let Some(input_account_in_mt) = input_account_in_mt.clone() { | ||
| // input_accounts.push(input_account_in_mt.clone()); | ||
| // } | ||
| // if input_accounts.len() == 3 { | ||
| // break; | ||
| // } | ||
| // } | ||
| // let result = perform_create_pda_with_event( | ||
| // &mut e2e_env.indexer, | ||
| // &mut e2e_env.rpc, | ||
| // &env, | ||
| // &payer, | ||
| // seed, | ||
| // &data, | ||
| // &ID, | ||
| // Some(input_accounts), | ||
| // Some(vec![account_not_in_value_array_and_in_mt.clone()]), | ||
| // CreatePdaMode::ReadOnlyZkpOfInsertedAccount, | ||
| // ) | ||
| // .await; | ||
| // assert_rpc_error( | ||
| // result, | ||
| // 1, | ||
| // SystemProgramError::ReadOnlyAccountDoesNotExist.into(), | ||
| // ) | ||
| // .unwrap(); | ||
| // } | ||
| // // 12. failing - zkp for invalidated account | ||
| // { | ||
| // let result = perform_create_pda_with_event( | ||
| // &mut e2e_env.indexer, | ||
| // &mut e2e_env.rpc, | ||
| // &env, | ||
| // &payer, | ||
| // seed, | ||
| // &data, | ||
| // &ID, | ||
| // Some(vec![account_not_in_value_array_and_in_mt.clone()]), | ||
| // Some(vec![account_not_in_value_array_and_in_mt.clone()]), | ||
| // CreatePdaMode::ReadOnlyZkpOfInsertedAccount, | ||
| // ) | ||
| // .await; | ||
| // assert_rpc_error( | ||
| // result, | ||
| // 1, | ||
| // SystemProgramError::ReadOnlyAccountDoesNotExist.into(), | ||
| // ) | ||
| // .unwrap(); | ||
| // } | ||
| // println!("post 12"); |
Comment on lines
+794
to
+813
| // // The transaction inserts the address first, then checks read only addresses. | ||
| // let result = perform_create_pda_with_event( | ||
| // &mut test_indexer, | ||
| // &mut rpc, | ||
| // &env, | ||
| // &payer, | ||
| // seed, | ||
| // &data, | ||
| // &ID, | ||
| // None, | ||
| // None, | ||
| // CreatePdaMode::ReadOnlyProofOfInsertedAddress, | ||
| // ) | ||
| // .await; | ||
| // assert_rpc_error( | ||
| // result, | ||
| // 0, | ||
| // SystemProgramError::ReadOnlyAddressAlreadyExists.into(), | ||
| // ) | ||
| // .unwrap(); |
sergeytimoshin
approved these changes
Jan 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes:
light-zero-copyWrappedMutPointer,WrappedPointerzerocopycrateZeroCopyTraitsconst PAD: boolinZeroCopyVec,ZeroCopyMutSliceandZeroCopyCyclicVeczerocopy::UnalignedforL&Tbatched-merkle-treeZeroCopyVecUsizewithZeroCopyVecU64(usize is no longer supported)BatchMetadatainMerkleTreeAccount&QueueAccountrefactorWrappedMutPointer->zerocopy::Ref<&mut [u8], T>From<u64>forBatchStatezerocopytraits forBatch(KnownLayout, Immutable, IntoBytes, FromBytes)BatchreplacedBatchStatewithu64(to satisfy zerocopy traits)Batchreplacedbloom_filter_is_wipedboolwithu8and added getters and setters which returnbool(zerocopy traits don't supportbool)merkle-tree-metadatalight_utils::pubkey::Pubkeyinstead ofsolana_program::pubkey:.Pubkeyfor zero copy compatibilitylight_utilsPubkeywith derived zerocopy traits,solana_program::pubkey::Pubkeyandanchor_lang::prelude::Pubkeyconversionsaccount-compressionprogramGroupAccessreturnPubkeyinstead of&Pubkeynecessary so that we can convertlight_utils::pubkey::Pubkeytoanchor::prelude::Pubkey(conversion is necessary because we need to derive zerocopy traits)light-batched-merkle-treesforbatch_append,insert-into-queues,light-system-programcheck_program_owner_state_merkle_treeadded generic condition to distinguish between append and nullify as an additional safeguard in case that invalid accounts are passedinvoke/processor.rs(prior reading an account that is modified in the same tx would fail, same for reading an address which is created in the same tx)
check_vec_capacityto check vector capacity (it's basically free in terms of CU)