Merge pull request #325 from monadicus/deps-canary-3.5.0

chore(aot): update for canary-3.5.0

Author: Meshiest

Cargo.lock

@@ -42,7 +42,7 @@ lto = "thin"
 opt-level = 1
 
 [workspace.dependencies]
-aleo-std = "0.1.24"
+aleo-std = "1.0.1"
 axum = { version = "0.7", default-features = false }
 # uncomment to enable #[debug_handler] for axum :^)
 # axum = { version = "0.7", features = ["macros"], default-features = false }
@@ -144,16 +144,16 @@ snops-common = { path = "./crates/common" }
 
 ## Comment to use version-pinned or local dependencies
 
-snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3eea16f" }
-snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3eea16f" }
-snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3eea16f" }
+snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "a1e4a28" }
+snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "a1e4a28" }
+snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "a1e4a28" }
 [workspace.dependencies.snarkvm]
 ## The following anchors are used by the `update_snarkos_dep.sh` script.
 ## Everything in-between the anchors is copied from the snarkos Cargo.toml
 ## CODEGEN_START
 #path = "../snarkVM"
 git = "https://github.com/ProvableHQ/snarkVM.git"
-rev = "59776cb"
-#version = "=1.3.0"
+rev = "a296d35"
+#version = "=1.4.0"
 ## CODEGEN_END
 features = ["rocks"]

Cargo.toml

@@ -222,6 +222,15 @@ credits.aleo
 $ snarkos-aot program cost ./example.aleo
 2568400
 
+# Calculate the cost of executing a function in a program
+$ snarkos-aot program cost ./credits.aleo transfer_public example.aleo 1u64
+34060
+
+# Calculate the cost of executing a function in a program for devnets below the cost-v2 height
+# Programs that call other programs will be much more expensive with cost-v1
+$ snarkos-aot program cost --cost-v1 ./credits.aleo transfer_public example.aleo 1u64
+51060
+
 # Get a list of imports for a program (output in a json format with --json)
 $ snarkos-aot program imports ./staking_v1.aleo --json
 ["credits.aleo"]

README.md

@@ -190,7 +190,7 @@ pub fn estimate_cost<N: Network>(
             .next()
             .ok_or(anyhow!("No transitions"))?;
         let stack = process.get_stack(transition.program_id())?;
-        cost_in_microcredits_v2(stack, transition.function_name())?
+        cost_in_microcredits_v2(&stack, transition.function_name())?
     } else {
         // Compute the finalize cost in microcredits.
         let mut finalize_cost = 0u64;
@@ -200,7 +200,7 @@ pub fn estimate_cost<N: Network>(
             // Retrieve the function name, program id, and program.
             let function_name = *transition.function_name();
             let stack = process.get_stack(transition.program_id())?;
-            let cost = cost_in_microcredits_v1(stack, &function_name)?;
+            let cost = cost_in_microcredits_v1(&stack, &function_name)?;
 
             // Accumulate the finalize cost.
             if let Some(cost) = finalize_cost.checked_add(cost) {

crates/aot/src/auth/auth_fee.rs

@@ -1,3 +1,4 @@
+use aleo_std::StorageMode;
 use anyhow::{Result, anyhow, bail};
 use clap::{Args, ValueEnum};
 use rand::{CryptoRng, Rng};
@@ -95,7 +96,7 @@ pub fn execute_local<R: Rng + CryptoRng, N: Network>(
     } else {
         let query = query_raw.clone().map(Query::REST);
 
-        let store = ConsensusStore::<N, ConsensusMemory<_>>::open(None)?;
+        let store = ConsensusStore::<N, ConsensusMemory<_>>::open(StorageMode::Production)?;
         let vm = MemVM::from(store)?;
 
         match auth {

crates/aot/src/auth/execute.rs

@@ -346,7 +346,7 @@ impl<N: Network> Genesis<N> {
 
         // Initialize a new VM.
         let vm = snarkvm::synthesizer::VM::from(ConsensusStore::<N, ConsensusMemory<_>>::open(
-            Some(0),
+            StorageMode::Development(0),
         )?)?;
 
         // region: Genesis Records

crates/aot/src/genesis.rs

@@ -226,8 +226,6 @@ impl<N: Network> Runner<N> {
             .map_err(|e| e.context("create client"))?,
         };
 
-        agent.status(SnarkOSStatus::Started);
-
         // only monitor block updates if we have a checkpoint manager or agent status
         // API
         if manager.is_some() || agent.is_enabled() {
@@ -283,12 +281,12 @@ impl<N: Network> Runner<N> {
     /// Check the proposal cache for this address and remove it if it is
     /// invalid.
     fn check_proposal_cache(addr: Address<N>) {
-        let proposal_cache_path = proposal_cache_path(N::ID, None);
+        let proposal_cache_path = proposal_cache_path(N::ID, &StorageMode::Production);
         if !proposal_cache_path.exists() {
             return;
         }
 
-        let Err(e) = ProposalCache::<N>::load(addr, None) else {
+        let Err(e) = ProposalCache::<N>::load(addr, &StorageMode::Production) else {
             return;
         };
 

crates/aot/src/runner/mod.rs

@@ -5,7 +5,7 @@ use std::{
     str::FromStr,
 };
 
-use chrono::DateTime;
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::{
@@ -90,7 +90,11 @@ impl Display for BinaryEntry {
         )?;
         if let BinarySource::Path(path) = &self.source {
             if let Ok(time) = path.metadata().and_then(|m| m.modified()) {
-                writeln!(f, "last modified: {}", DateTime::from(time).naive_local())?;
+                writeln!(
+                    f,
+                    "last modified: {}",
+                    DateTime::<Utc>::from(time).naive_local()
+                )?;
             }
         }
         Ok(())