Merge pull request #12 from sonicfromnewyoke/sonic/rename-pubkey-to-address

refactor: replace `pubkey` with `address`

Author: sam0x17

Cargo.lock

@@ -53,9 +53,9 @@ protobuf-src = "1"
 serde = { version = "1", default-features = false }
 serde_cbor = "0"
 agave-geyser-plugin-interface = "3"
+solana-address = "1"
 solana-hash = "3"
 solana-logger = "3"
-solana-pubkey = "3"
 solana-signature = { version = "3", default-features = false }
 solana-accounts-db = "3"
 solana-entry = "3"

Cargo.toml

@@ -25,7 +25,7 @@ solana-runtime.workspace = true
 solana-hash.workspace = true
 solana-geyser-plugin-manager.workspace = true
 solana-storage-proto.workspace = true
-solana-pubkey.workspace = true
+solana-address.workspace = true
 solana-transaction.workspace = true
 solana-transaction-status.workspace = true
 solana-ledger.workspace = true

jetstreamer-firehose/Cargo.toml

@@ -3,13 +3,13 @@ use crossbeam_channel::{Receiver, Sender, unbounded};
 use futures_util::FutureExt;
 use futures_util::future::BoxFuture;
 use reqwest::{Client, Url};
+use solana_address::Address;
 use solana_geyser_plugin_manager::{
     block_metadata_notifier_interface::BlockMetadataNotifier,
     geyser_plugin_service::GeyserPluginServiceError,
 };
 use solana_hash::Hash;
 use solana_ledger::entry_notifier_interface::EntryNotifier;
-use solana_pubkey::Pubkey;
 use solana_reward_info::RewardInfo;
 use solana_rpc::{
     optimistically_confirmed_bank_tracker::SlotNotification,
@@ -374,7 +374,7 @@ pub struct RewardsData {
     /// Slot the rewards correspond to.
     pub slot: u64,
     /// Reward recipients and their associated reward information.
-    pub rewards: Vec<(Pubkey, RewardInfo)>,
+    pub rewards: Vec<(Address, RewardInfo)>,
 }
 
 /// Block-level data streamed to block handlers.
@@ -748,7 +748,7 @@ where
                         let mut entry_index: usize = 0;
                         let mut this_block_executed_transaction_count: u64 = 0;
                         let mut this_block_entry_count: u64 = 0;
-                        let mut this_block_rewards: Vec<(Pubkey, RewardInfo)> = Vec::new();
+                        let mut this_block_rewards: Vec<(Address, RewardInfo)> = Vec::new();
 
                         for node_with_cid in &nodes.0 {
                             item_index += 1;
@@ -1643,7 +1643,7 @@ async fn firehose_geyser_thread(
                     let mut entry_index: usize = 0;
                     let mut this_block_executed_transaction_count: u64 = 0;
                     let mut this_block_entry_count: u64 = 0;
-                    let mut this_block_rewards: Vec<(Pubkey, RewardInfo)> = Vec::new();
+                    let mut this_block_rewards: Vec<(Address, RewardInfo)> = Vec::new();
 
                     nodes.each(|node_with_cid| -> Result<(), Box<dyn std::error::Error>> {
                         item_index += 1;
@@ -1904,7 +1904,7 @@ fn is_simple_vote_transaction(versioned_tx: &VersionedTransaction) -> bool {
 #[inline(always)]
 fn convert_proto_rewards(
     proto_rewards: &solana_storage_proto::convert::generated::Rewards,
-) -> Result<Vec<(Pubkey, RewardInfo)>, Box<dyn std::error::Error>> {
+) -> Result<Vec<(Address, RewardInfo)>, Box<dyn std::error::Error>> {
     let mut keyed_rewards = Vec::with_capacity(proto_rewards.rewards.len());
     for proto_reward in proto_rewards.rewards.iter() {
         let reward = RewardInfo {
@@ -1926,7 +1926,7 @@ fn convert_proto_rewards(
         };
         let pubkey = proto_reward
             .pubkey
-            .parse::<Pubkey>()
+            .parse::<Address>()
             .map_err(|err| Box::new(err) as Box<dyn std::error::Error>)?;
         keyed_rewards.push((pubkey, reward));
     }

jetstreamer-firehose/src/firehose.rs

@@ -14,7 +14,7 @@ jetstreamer-firehose.workspace = true
 
 serde.workspace = true
 solana-message.workspace = true
-solana-pubkey.workspace = true
+solana-address.workspace = true
 tokio.workspace = true
 log.workspace = true
 clickhouse.workspace = true

jetstreamer-plugin/Cargo.toml

@@ -4,8 +4,8 @@ use clickhouse::{Client, Row};
 use futures_util::FutureExt;
 use log::error;
 use serde::{Deserialize, Serialize};
+use solana_address::Address;
 use solana_message::VersionedMessage;
-use solana_pubkey::Pubkey;
 
 use crate::{Plugin, PluginFuture};
 use jetstreamer_firehose::firehose::{BlockData, TransactionData};
@@ -14,7 +14,7 @@ const DB_WRITE_INTERVAL_SLOTS: u64 = 1000;
 
 #[derive(Default)]
 struct ThreadLocalData {
-    slot_stats: HashMap<u64, HashMap<Pubkey, ProgramStats>>,
+    slot_stats: HashMap<u64, HashMap<Address, ProgramStats>>,
     pending_rows: Vec<ProgramEvent>,
     slots_since_flush: u64,
 }
@@ -28,7 +28,7 @@ struct ProgramEvent {
     pub slot: u32,
     // Stored as ClickHouse DateTime('UTC') -> UInt32 seconds; we clamp Solana i64.
     pub timestamp: u32,
-    pub program_id: Pubkey,
+    pub program_id: Address,
     pub count: u32,
     pub error_count: u32,
     pub min_cus: u32,
@@ -245,7 +245,7 @@ async fn write_program_events(
 fn events_from_slot(
     slot: u64,
     block_time: Option<i64>,
-    slot_data: &HashMap<Pubkey, ProgramStats>,
+    slot_data: &HashMap<Address, ProgramStats>,
 ) -> Vec<ProgramEvent> {
     let raw_ts = block_time.unwrap_or(0);
     let timestamp: u32 = if raw_ts < 0 {