Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ZKS-05] Caller Is Not Fixed Throughout Function Execution #2076

Merged
merged 13 commits into from
Jan 27, 2024
Merged

[ZKS-05] Caller Is Not Fixed Throughout Function Execution #2076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ce4ea93
Enforce the use of the same signer in a given call graph. Use root tv…
vicsn Oct 10, 2023
b5d6d08
Increase test counts:
vicsn Jan 5, 2024
47c24c3
Update test_vm_execute_and_finalize expectations: fees increased
vicsn Jan 5, 2024
6d2dcb6
Merge remote-tracking branch 'origin/mainnet' into commit_self_caller
vicsn Jan 21, 2024
fba3a26
Update expectations
vicsn Jan 21, 2024
fd3a818
Resolve merge conflicts
howardwu Jan 21, 2024
93020db
nit: simplify call
howardwu Jan 21, 2024
6230cab
Use existing Address::to_field
vicsn Jan 21, 2024
2438be0
Remove unused reverse_scm map and correct scm retrieval
vicsn Jan 21, 2024
eca98a6
Nittiest of nits
vicsn Jan 21, 2024
3f0e2d0
Clean up setting root tvk
vicsn Jan 21, 2024
7ec8642
Use try_fold to check scm equality
vicsn Jan 21, 2024
2d67be3
Resample genesis block and parameters
raychu86 Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve merge conflicts
  • Loading branch information
@howardwu
howardwu committed Jan 21, 2024
commit fd3a8183bdf23cff39a84f97fdff10ef16bfe514
2 changes: 1 addition & 1 deletion ledger/store/src/helpers/rocksdb/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl<N: Network> FinalizeStorage<N> for FinalizeDB<N> {
committee_store,
program_id_map: rocksdb::RocksDB::open_map_testing(temp_dir.clone(), dev, MapID::Program(ProgramMap::ProgramID))?,
key_value_map: rocksdb::RocksDB::open_nested_map_testing(temp_dir, dev, MapID::Program(ProgramMap::KeyValueID))?,
dev,
storage_mode: dev.into(),
})
}

Expand Down
18 changes: 9 additions & 9 deletions ledger/store/src/helpers/rocksdb/transition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ impl<N: Network> TransitionStorage<N> for TransitionDB<N> {
/// Initializes the transition storage.
fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self> {
Ok(Self {
locator_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::Locator))?,
input_store: InputStore::open(dev)?,
output_store: OutputStore::open(dev)?,
tpk_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::TPK))?,
reverse_tpk_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::ReverseTPK))?,
tcm_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::TCM))?,
reverse_tcm_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::ReverseTCM))?,
scm_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::SCM))?,
reverse_scm_map: rocksdb::RocksDB::open_map(N::ID, dev, MapID::Transition(TransitionMap::ReverseSCM))?,
locator_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::Locator))?,
input_store: InputStore::open(storage.clone())?,
output_store: OutputStore::open(storage.clone())?,
tpk_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::TPK))?,
reverse_tpk_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::ReverseTPK))?,
tcm_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::TCM))?,
reverse_tcm_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::ReverseTCM))?,
scm_map: rocksdb::RocksDB::open_map(N::ID, storage.clone(), MapID::Transition(TransitionMap::SCM))?,
reverse_scm_map: rocksdb::RocksDB::open_map(N::ID, storage, MapID::Transition(TransitionMap::ReverseSCM))?,
})
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.