remove near-fmt dep from near-vm-runner

core/o11y/Cargo.toml

@@ -11,10 +11,12 @@ publish = true
 
 [dependencies]
 near-crypto.workspace = true
+near-fmt.workspace = true
 near-primitives-core.workspace = true
 
 actix.workspace = true
 atty.workspace = true
+base64.workspace = true
 clap.workspace = true
 once_cell.workspace = true
 opentelemetry.workspace = true
@@ -37,10 +39,12 @@ smartstring.workspace = true
 
 [features]
 nightly_protocol = [
+  "near-fmt/nightly_protocol",
   "near-primitives-core/nightly_protocol",
 ]
 nightly = [
   "nightly_protocol",
+  "near-fmt/nightly",
   "near-primitives-core/nightly",
 ]
 io_trace = []

core/o11y/src/io_tracer.rs

@@ -17,6 +17,7 @@
 //! analysis. The estimator has a replay command that understands the output
 //! produced by the IO trace.
 
+use base64::Engine;
 use std::collections::HashMap;
 use std::io::Write;
 use tracing::{span, Subscriber};
@@ -218,7 +219,15 @@ impl IoTraceLayer {
                 }
             }
             Some(IoEventType::StorageOp(storage_op)) => {
-                let key = visitor.key.as_deref().unwrap_or("?");
+                let key_bytes = visitor.key.map(|key| {
+                    base64::engine::general_purpose::STANDARD
+                        .decode(key)
+                        .expect("key was not properly base64-encoded")
+                });
+                let key = key_bytes
+                    .as_ref()
+                    .map(|k| format!("{}", near_fmt::Bytes(&*k)))
+                    .unwrap_or_else(|| String::from("?"));
                 let size = FormattedSize(visitor.size);
                 let tn_db_reads = visitor.tn_db_reads.unwrap();
                 let tn_mem_reads = visitor.tn_mem_reads.unwrap();

runtime/near-vm-runner/Cargo.toml

@@ -12,6 +12,7 @@ publish = true
 
 [dependencies]
 anyhow = { workspace = true, optional = true }
+base64.workspace = true
 bn.workspace = true
 borsh.workspace = true
 clap = { workspace = true, optional = true }
@@ -37,7 +38,6 @@ wasmtime = { workspace = true, optional = true }
 
 near-account-id.workspace = true
 near-crypto.workspace = true
-near-fmt.workspace = true
 near-primitives-core.workspace = true
 near-rpc-error-macro.workspace = true
 
@@ -77,7 +77,6 @@ wat.workspace = true
 
 [features]
 nightly_protocol = [
-  "near-fmt/nightly_protocol",
   "near-primitives-core/nightly_protocol",
 ]
 # all vms enabled for now
@@ -122,7 +121,6 @@ protocol_feature_fix_contract_loading_cost = [
 nightly = [
   "nightly_protocol",
   "protocol_feature_fix_contract_loading_cost",
-  "near-fmt/nightly",
   "near-primitives-core/nightly",
 ]
 sandbox = []

runtime/near-vm-runner/src/logic/action.rs

@@ -1,6 +1,5 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 use near_crypto::PublicKey;
-use near_fmt::AbbrBytes;
 use near_primitives_core::{
     account::AccessKey,
     serialize::dec_format,
@@ -10,6 +9,11 @@ use serde_with::base64::Base64;
 use serde_with::serde_as;
 use std::fmt;
 
+fn base64(s: &[u8]) -> String {
+    use base64::Engine;
+    base64::engine::general_purpose::STANDARD.encode(s)
+}
+
 #[derive(
     BorshSerialize,
     BorshDeserialize,
@@ -83,7 +87,7 @@ pub struct DeployContractAction {
 impl fmt::Debug for DeployContractAction {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("DeployContractAction")
-            .field("code", &format_args!("{}", AbbrBytes(&self.code)))
+            .field("code", &format_args!("{}", base64(&self.code)))
             .finish()
     }
 }
@@ -105,7 +109,7 @@ impl fmt::Debug for FunctionCallAction {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("FunctionCallAction")
             .field("method_name", &format_args!("{}", &self.method_name))
-            .field("args", &format_args!("{}", AbbrBytes(&self.args)))
+            .field("args", &format_args!("{}", base64(&self.args)))
             .field("gas", &format_args!("{}", &self.gas))
             .field("deposit", &format_args!("{}", &self.deposit))
             .finish()

runtime/near-vm-runner/src/logic/logic.rs

@@ -23,6 +23,12 @@ use std::mem::size_of;
 
 pub type Result<T, E = VMLogicError> = ::std::result::Result<T, E>;
 
+#[cfg(feature = "io_trace")]
+fn base64(s: &[u8]) -> String {
+    use base64::Engine;
+    base64::engine::general_purpose::STANDARD.encode(s)
+}
+
 pub struct VMLogic<'a> {
     /// Provides access to the components outside the Wasm runtime for operations on the trie and
     /// receipts creation.
@@ -2410,7 +2416,7 @@ impl<'a> VMLogic<'a> {
         tracing::trace!(
             target = "io_tracer",
             storage_op = "write",
-            key = %near_fmt::Bytes(&key),
+            key = base64(&key),
             size = value_len,
             evicted_len = evicted.as_ref().map(Vec::len),
             tn_mem_reads = nodes_delta.mem_reads,
@@ -2518,7 +2524,7 @@ impl<'a> VMLogic<'a> {
         tracing::trace!(
             target = "io_tracer",
             storage_op = "read",
-            key = %near_fmt::Bytes(&key),
+            key = base64(&key),
             size = read.as_ref().map(Vec::len),
             tn_db_reads = nodes_delta.db_reads,
             tn_mem_reads = nodes_delta.mem_reads,
@@ -2592,7 +2598,7 @@ impl<'a> VMLogic<'a> {
         tracing::trace!(
             target = "io_tracer",
             storage_op = "remove",
-            key = %near_fmt::Bytes(&key),
+            key = base64(&key),
             evicted_len = removed.as_ref().map(Vec::len),
             tn_mem_reads = nodes_delta.mem_reads,
             tn_db_reads = nodes_delta.db_reads,
@@ -2665,7 +2671,7 @@ impl<'a> VMLogic<'a> {
         tracing::trace!(
             target = "io_tracer",
             storage_op = "exists",
-            key = %near_fmt::Bytes(&key),
+            key = base64(&key),
             tn_mem_reads = nodes_delta.mem_reads,
             tn_db_reads = nodes_delta.db_reads,
         );