From e5e39364dc50571fce26d9c3320c19672f0b8d19 Mon Sep 17 00:00:00 2001 From: Hardhat Chad Date: Thu, 15 Feb 2024 19:50:39 +0000 Subject: [PATCH] display --- Cargo.lock | 28 ++++++++++++++++++---------- Cargo.toml | 3 +-- src/state/hash.rs | 8 +++++++- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fcf77ae..b8dc3f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -617,6 +617,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +[[package]] +name = "bs58" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + [[package]] name = "bs64" version = "0.1.2" @@ -2346,8 +2355,7 @@ dependencies = [ name = "ore" version = "0.1.0" dependencies = [ - "arrayvec", - "bincode", + "bs58 0.5.0", "bs64", "bytemuck", "num_enum 0.7.2", @@ -3366,7 +3374,7 @@ dependencies = [ "Inflector", "base64 0.21.5", "bincode", - "bs58", + "bs58 0.4.0", "bv", "lazy_static", "serde", @@ -3676,7 +3684,7 @@ dependencies = [ "ahash 0.8.6", "blake3", "block-buffer 0.10.4", - "bs58", + "bs58 0.4.0", "bv", "byteorder", "cc", @@ -3825,7 +3833,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", - "bs58", + "bs58 0.4.0", "bv", "bytemuck", "cc", @@ -4011,7 +4019,7 @@ dependencies = [ "async-trait", "base64 0.21.5", "bincode", - "bs58", + "bs58 0.4.0", "indicatif", "log", "reqwest", @@ -4035,7 +4043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "131662e5eea4fa5fc88b01f07d9e430315c0976be848ba3994244249c5fb033a" dependencies = [ "base64 0.21.5", - "bs58", + "bs58 0.4.0", "jsonrpc-core", "reqwest", "semver", @@ -4151,7 +4159,7 @@ dependencies = [ "bincode", "bitflags 2.4.1", "borsh 0.10.3", - "bs58", + "bs58 0.4.0", "bytemuck", "byteorder", "chrono", @@ -4200,7 +4208,7 @@ version = "1.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f58786e949f43b8c9b826fdfa5ad8586634b077ab04f989fb8e30535786712" dependencies = [ - "bs58", + "bs58 0.4.0", "proc-macro2", "quote", "rustversion", @@ -4339,7 +4347,7 @@ dependencies = [ "base64 0.21.5", "bincode", "borsh 0.10.3", - "bs58", + "bs58 0.4.0", "lazy_static", "log", "serde", diff --git a/Cargo.toml b/Cargo.toml index 1ebf2b6..cbcd47c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,7 @@ no-entrypoint = [] default = [] [dependencies] -arrayvec = { version = "0.7.4", default-features = false } -bincode = "1.3.3" +bs58 = "0.5.0" bytemuck = "1.14.3" num_enum = "0.7.2" shank = "0.3.0" diff --git a/src/state/hash.rs b/src/state/hash.rs index 9a55030..5ad342f 100644 --- a/src/state/hash.rs +++ b/src/state/hash.rs @@ -1,4 +1,4 @@ -use std::mem::transmute; +use std::{fmt, mem::transmute}; use bytemuck::{Pod, Zeroable}; use solana_program::keccak::{Hash as KeccakHash, HASH_BYTES}; @@ -23,4 +23,10 @@ impl From for KeccakHash { } } +impl fmt::Display for Hash { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "{}", bs58::encode(self.0).into_string()) + } +} + impl_to_bytes!(Hash);