Skip to content

Commit

Permalink
Merge pull request #86 from step-finance/dev
Browse files Browse the repository at this point in the history
dev -> live
  • Loading branch information
JamesMDunn authored Oct 24, 2024
2 parents d628a54 + f5d7ba5 commit c9e6f73
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ orbs:
jobs:
build-and-push-image:
machine:
image: ubuntu-2204:2022.04.2
image: ubuntu-2204:2024.04.4
resource_class: xlarge
steps:
- checkout
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ jobs:
command: fmt
args: --all -- --check

- name: cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --workspace --all-targets -- --deny=warnings
# - name: cargo clippy
# uses: actions-rs/cargo@v1
# with:
# command: clippy
# args: --workspace --all-targets -- --deny=warnings

- name: Build
run: ./ci/cargo-build-test.sh
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.73-bullseye as builder
FROM rust:1.78-bullseye as builder
RUN apt update
RUN apt install -y build-essential
WORKDIR /geyser
Expand Down
2 changes: 1 addition & 1 deletion ci/rust-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
if [[ -n $RUST_STABLE_VERSION ]]; then
stable_version="$RUST_STABLE_VERSION"
else
stable_version=1.75.0
stable_version=1.78.0
fi

if [[ -n $RUST_NIGHTLY_VERSION ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/solana-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ set -e

cd "$(dirname "$0")/../crates/plugin/"

cargo read-manifest | jq -r '.dependencies[] | select(.name == "solana-geyser-plugin-interface") | .req'
cargo read-manifest | jq -r '.dependencies[] | select(.name == "agave-geyser-plugin-interface") | .req'
4 changes: 2 additions & 2 deletions crates/plugin/src/selectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ use crate::{

#[derive(Debug)]
pub struct TransactionSelector {
/// K = Program, V = routing_key
/// K = Program, V = `routing_key`
programs: HashMap<Pubkey, Arc<String>>,
/// K = Program, V = routing_key
/// K = Program, V = `routing_key`
pubkeys: HashMap<Pubkey, Arc<String>>,
/// Routing prefixes that support routing ALL programs
allows_all_programs: Vec<Arc<String>>,
Expand Down
2 changes: 1 addition & 1 deletion crates/plugin/src/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub(crate) struct StatsRequest {
///stats thread needs to do its job
#[derive(Debug)]
pub(crate) struct Stats {
///a quick shortcut into the slot_stats buffer for most recent slot
///a quick shortcut into the `slot_stats` buffer for most recent slot
///this should allow a hot path of code execution
#[allow(clippy::struct_field_names)]
most_recent_slot_stats: (u64, usize),
Expand Down
6 changes: 3 additions & 3 deletions crates/rabbitmq/src/geyser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub struct AccountUpdate {
pub write_version: u64,
/// The slot in which this account was updated
pub slot: u64,
/// The block_time in which this account was updated
/// The `block_time` in which this account was updated
/// this is not known during processing, but is filled out by confirmooor when slots confirm
pub block_time: Option<i64>,
/// True if this update was triggered by a validator startup
Expand Down Expand Up @@ -102,7 +102,7 @@ pub struct UiAccountUpdate {
pub write_version: u64,
/// The slot in which this account was updated
pub slot: u64,
/// The block_time in which this account was updated
/// The `block_time` in which this account was updated
/// this is not known during processing, but is filled out by confirmooor when slots confirm
pub block_time: Option<i64>,
/// True if this update was triggered by a validator startup
Expand All @@ -124,7 +124,7 @@ pub struct InstructionNotify {
/// The slot in which the transaction including this instruction was
/// reported
pub slot: u64,
/// The block_time in which this account was updated
/// The `block_time` in which this account was updated
/// this is not known during processing, but is filled out by confirmooor when slots confirm
pub block_time: Option<i64>,
}
Expand Down

0 comments on commit c9e6f73

Please sign in to comment.