Skip to content

Commit

Permalink
solana: update to 1.18.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fanatid committed Mar 11, 2024
1 parent e4d05c7 commit 35ea61e
Show file tree
Hide file tree
Showing 9 changed files with 680 additions and 722 deletions.
1,368 changes: 663 additions & 705 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[workspace]
members = [
"plerkle", # 1.6.0+solana.1.17.20
"plerkle", # 1.6.0+solana.1.18.4
"plerkle_messenger", # 1.6.6
"plerkle_serialization", # 1.6.0+solana.1.17.20
"plerkle_serialization", # 1.6.0+solana.1.18.4
]

[profile.release]
Expand Down
4 changes: 2 additions & 2 deletions Solana.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG SOLANA_VERSION=v1.17.12
ARG RUST_VERSION=1.73.0
ARG SOLANA_VERSION=v1.18.4
ARG RUST_VERSION=1.75.0
FROM rust:$RUST_VERSION-bullseye as builder
RUN apt-get update \
&& apt-get -y install \
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_VERSION ]]; then
stable_version="$RUST_VERSION"
else
stable_version=1.73.0
stable_version=1.75.0
fi

if [[ -n $RUST_NIGHTLY_VERSION ]]; then
Expand Down
10 changes: 5 additions & 5 deletions plerkle/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "plerkle"
description = "Geyser plugin with dynamic config reloading, message bus agnostic abstractions and a whole lot of fun."
version = "1.6.0+solana.1.17.20"
version = "1.6.0+solana.1.18.4"
authors = ["Metaplex Developers <[email protected]>"]
repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
license = "AGPL-3.0"
Expand Down Expand Up @@ -31,10 +31,10 @@ plerkle_serialization = { path = "../plerkle_serialization", version = "1.6.0" }
serde = "1.0.144"
serde_derive = "1.0.103"
serde_json = "1.0.83"
solana-geyser-plugin-interface = "=1.17.20"
solana-logger = "=1.17.20"
solana-sdk = "=1.17.20"
solana-transaction-status = "=1.17.20"
solana-geyser-plugin-interface = "=1.18.4"
solana-logger = "=1.18.4"
solana-sdk = "=1.18.4"
solana-transaction-status = "=1.18.4"
thiserror = "1.0.30"
tokio = { version = "1.23.0", features = ["full"] }
tracing = "0.1.37"
Expand Down
2 changes: 1 addition & 1 deletion plerkle/src/geyser_plugin_nft.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ impl GeyserPlugin for Plerkle<'static> {
"Plerkle"
}

fn on_load(&mut self, config_file: &str) -> Result<()> {
fn on_load(&mut self, config_file: &str, _is_reload: bool) -> Result<()> {
solana_logger::setup_with_default("info");

// Read in config file.
Expand Down
4 changes: 2 additions & 2 deletions plerkle_messenger/src/redis_messenger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ impl Messenger for RedisMessenger {
msg: format!("Connection String Missing: {}", REDIS_CON_STR),
})?;
// Setup Redis client.
let client = redis::Client::open(uri).unwrap();
let client = redis::Client::open(uri.clone()).unwrap();

// Get connection.
let connection = client.get_tokio_connection_manager().await.map_err(|e| {
error!("{}", e.to_string());
error!("failed to connect to {uri}, error: {e:?}");
MessengerError::ConnectionError { msg: e.to_string() }
})?;

Expand Down
6 changes: 3 additions & 3 deletions plerkle_serialization/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "plerkle_serialization"
description = "Metaplex Flatbuffers Plerkle Serialization for Geyser plugin producer/consumer patterns."
version = "1.6.0+solana.1.17.20"
version = "1.6.0+solana.1.18.4"
authors = ["Metaplex Developers <[email protected]>"]
repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
license = "AGPL-3.0"
Expand All @@ -14,8 +14,8 @@ bs58 = "0.4.0"
chrono = "0.4.22"
flatbuffers = "23.1.21"
serde = "1.0.152"
solana-sdk = "=1.17.20"
solana-transaction-status = "=1.17.20"
solana-sdk = "=1.18.4"
solana-transaction-status = "=1.18.4"
thiserror = "1.0.32"

[package.metadata.docs.rs]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.73.0"
channel = "1.75.0"
components = ["clippy", "rustfmt"]
profile = "minimal"

0 comments on commit 35ea61e

Please sign in to comment.