Skip to content

Commit

Permalink
Update indexer API deps in CLI to d954cf4eef9ceabdd941b2e08923fff8398…
Browse files Browse the repository at this point in the history
…4b591, use CE Hasura image (aptos-labs#13933)
  • Loading branch information
banool authored Jul 11, 2024
1 parent 1feb429 commit d452894
Show file tree
Hide file tree
Showing 14 changed files with 1,067 additions and 910 deletions.
361 changes: 186 additions & 175 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions consensus/src/quorum_store/proof_coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ impl ProofCoordinator {
signed_batch_info.batch_info().clone(),
IncrementalProofState::new(signed_batch_info.batch_info().clone()),
);
#[allow(deprecated)]
self.batch_info_to_time
.entry(signed_batch_info.batch_info().clone())
.or_insert(chrono::Utc::now().naive_utc().timestamp_micros() as u64);
Expand Down Expand Up @@ -228,6 +229,7 @@ impl ProofCoordinator {
self.proof_cache
.insert(proof.info().clone(), proof.multi_signature().clone());
// quorum store measurements
#[allow(deprecated)]
let duration = chrono::Utc::now().naive_utc().timestamp_micros() as u64
- self
.batch_info_to_time
Expand Down
4 changes: 3 additions & 1 deletion consensus/src/quorum_store/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ impl<T> Timeouts<T> {
}

pub(crate) fn add(&mut self, value: T, timeout: usize) {
#[allow(deprecated)]
let expiry = Utc::now().naive_utc().timestamp_millis() + timeout as i64;
self.timeouts.push_back((expiry, value));
}

pub(crate) fn expire(&mut self) -> Vec<T> {
let cur_time = chrono::Utc::now().naive_utc().timestamp_millis();
#[allow(deprecated)]
let cur_time = Utc::now().naive_utc().timestamp_millis();
trace!(
"QS: expire cur time {} timeouts len {}",
cur_time,
Expand Down
2 changes: 2 additions & 0 deletions crates/aptos/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
All notable changes to the Aptos CLI will be captured in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased
- Upgraded indexer processors for localnet from 5244b84fa5ed872e5280dc8df032d744d62ad29d to d954cf4eef9ceabdd941b2e08923fff83984b591. Upgraded Hasura metadata accordingly.
- Upgraded Hasura image from 2.36.1 to 2.40.2-ce. Note that we use the Community Edition, so the console won't ask users to upgrade to enterprise anymore / hint at any enterprise features.

## [3.5.0] - 2024/07/06
- Add balance command to easily get account balances for APT currently
Expand Down
4 changes: 2 additions & 2 deletions crates/aptos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ pathsearch = { workspace = true }
poem = { workspace = true }
# We set default-features to false so we don't onboard the libpq dep. See more here:
# https://github.com/aptos-labs/aptos-core/pull/12568
processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d", default-features = false }
processor = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "d954cf4eef9ceabdd941b2e08923fff83984b591", default-features = false }
rand = { workspace = true }
reqwest = { workspace = true }
self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = ["archive-zip", "compression-zip-deflate"] }
serde = { workspace = true }
serde_json = { workspace = true }
serde_yaml = { workspace = true }
server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "5244b84fa5ed872e5280dc8df032d744d62ad29d" }
server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "d954cf4eef9ceabdd941b2e08923fff83984b591" }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
Expand Down
Loading

0 comments on commit d452894

Please sign in to comment.