From 7fa24a8a9ffa7332a37fa437d3dd9944b26ce91d Mon Sep 17 00:00:00 2001 From: austbot Date: Wed, 1 Feb 2023 09:52:40 -0600 Subject: [PATCH] revert solana version --- .github/workflows/release.yml | 11 +++++------ Solana.Dockerfile | 6 ++++-- ci/rust-version.sh | 2 +- ci/solana-version.sh | 11 ----------- plerkle/Cargo.toml | 14 +++++++------- plerkle_messenger/Cargo.toml | 2 +- plerkle_messenger/src/redis_messenger.rs | 3 +-- plerkle_serialization/Cargo.toml | 6 +++--- 8 files changed, 22 insertions(+), 33 deletions(-) delete mode 100755 ci/solana-version.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b495d491..f1007ea5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,8 @@ on: env: CARGO_TERM_COLOR: always IMAGE_NAME: plerkle-test-validator + SOLANA_VERSION_STABLE: 1.36.6 + SOLANA_VERSION_REGRET: 1.14.13 jobs: release: runs-on: buildjet-4vcpu-ubuntu-2004 @@ -19,7 +21,6 @@ jobs: export RUST_STABLE_VERSION=1.65.0 source ci/rust-version.sh echo "RUST_STABLE=$rust_stable" | tee -a $GITHUB_ENV - - name: Set env vars run: | source ci/env.sh @@ -48,8 +49,6 @@ jobs: run: | echo "CI_TAG=${GITHUB_REF#refs/*/}" >> "$GITHUB_ENV" echo "CI_OS_NAME=linux" >> "$GITHUB_ENV" - - SOLANA_VERSION="$(./ci/solana-version.sh)" SOLANA_VERSION="v${SOLANA_VERSION#=}" echo "SOLANA_VERSION=$SOLANA_VERSION" >> "$GITHUB_ENV" @@ -97,6 +96,6 @@ jobs: # Strip git ref prefix from version VERSION=$CI_TAG echo IMAGE_ID=$IMAGE_ID - echo VERSION=$VERSION - docker tag $IMAGE_NAME $IMAGE_ID:$VERSION - docker push $IMAGE_ID:$VERSION + echo VERSION=$VERSION-$RUST_STABLE-$SOLANA_VERSION + docker tag $IMAGE_NAME $IMAGE_ID:$VERSION-$RUST_STABLE-$SOLANA_VERSION + docker push $IMAGE_ID:$VERSION-$RUST_STABLE-$SOLANA_VERSION diff --git a/Solana.Dockerfile b/Solana.Dockerfile index 3fb7c38e..7bc9ed2e 100644 --- a/Solana.Dockerfile +++ b/Solana.Dockerfile @@ -1,4 +1,6 @@ -FROM rust:1.64-bullseye as builder +ARG SOLANA_VERSION=1.13.6 +ARG RUST_VERSION=1.65 +FROM rust:$RUST_VERSION-bullseye as builder RUN apt-get update \ && apt-get -y install \ wget \ @@ -24,7 +26,7 @@ COPY Cargo.lock /rust/ WORKDIR /rust RUN cargo build --release -FROM solanalabs/solana:v1.14.10 +FROM solanalabs/solana:$SOLANA_VERSION COPY --from=builder /rust/target/release/libplerkle.so /plugin/plugin.so COPY ./docker . RUN chmod +x ./*.sh diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 30a3346b..6626fbdf 100755 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -23,7 +23,7 @@ if [[ -n $RUST_STABLE_VERSION ]]; then stable_version="$RUST_STABLE_VERSION" else - stable_version=1.59.0 + stable_version=1.64.0 fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then diff --git a/ci/solana-version.sh b/ci/solana-version.sh deleted file mode 100755 index 75368347..00000000 --- a/ci/solana-version.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -# Prints the Solana version. - -set -e - -cd "$(dirname "$0")/.." -source ci/rust-version.sh stable - -cd "$(dirname "$0")/../plerkle" -cargo +"$rust_stable" read-manifest | jq -r '.dependencies[] | select(.name == "solana-geyser-plugin-interface") | .req' diff --git a/plerkle/Cargo.toml b/plerkle/Cargo.toml index a951e4d1..56de2930 100644 --- a/plerkle/Cargo.toml +++ b/plerkle/Cargo.toml @@ -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.3.0" +version = "1.3.1" authors = ["Metaplex Developers "] repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin" license = "AGPL-3.0" @@ -14,10 +14,10 @@ crate-type = ["cdylib", "rlib"] [dependencies] log = "0.4.11" async-trait = "0.1.53" -solana-sdk = { version =">=1.10.41" } -solana-transaction-status = { version = ">=1.10.41" } -solana-geyser-plugin-interface = { version = ">=1.10.41" } -solana-logger = { version = ">=1.10.41" } +solana-sdk = { version =">=1.13.6" } +solana-transaction-status = { version = ">=1.13.6" } +solana-geyser-plugin-interface = { version = ">=1.13.6" } +solana-logger = { version = ">=1.13.6" } thiserror = "1.0.30" base64 = "0.13.0" lazy_static = "1.4.0" @@ -31,9 +31,9 @@ cadence-macros = "0.29.0" chrono = "0.4.19" tracing = "0.1.35" hex = "0.4.3" -plerkle_messenger = { path = "../plerkle_messenger", version = "1.3.0", features = ["redis"] } +plerkle_messenger = { path = "../plerkle_messenger", version = "1.3.1", features = ["redis"] } flatbuffers = "22.10.26" -plerkle_serialization = { path = "../plerkle_serialization", version = "1.3.0" } +plerkle_serialization = { path = "../plerkle_serialization", version = "1.3.1" } tokio = { version = "1.23.0", features = ["full"] } figment = { version = "0.10.6", features = ["env", "test"] } diff --git a/plerkle_messenger/Cargo.toml b/plerkle_messenger/Cargo.toml index 230ac7a7..d01207fb 100644 --- a/plerkle_messenger/Cargo.toml +++ b/plerkle_messenger/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plerkle_messenger" description = "Metaplex Messenger trait for Geyser plugin producer/consumer patterns." -version = "1.3.0" +version = "1.3.1" authors = ["Metaplex Developers "] repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin" license = "AGPL-3.0" diff --git a/plerkle_messenger/src/redis_messenger.rs b/plerkle_messenger/src/redis_messenger.rs index ed959c30..1caec6ad 100644 --- a/plerkle_messenger/src/redis_messenger.rs +++ b/plerkle_messenger/src/redis_messenger.rs @@ -211,8 +211,7 @@ impl Messenger for RedisMessenger { .and_then(|r| { r.clone() .to_u128() - .map(|n| n as usize) - .min(Some(PIPELINE_SIZE_BYTES)) + .map(|n| (n as usize).min(PIPELINE_SIZE_BYTES)) }) .unwrap_or(PIPELINE_SIZE_BYTES); diff --git a/plerkle_serialization/Cargo.toml b/plerkle_serialization/Cargo.toml index 12ab553d..a62d0c76 100644 --- a/plerkle_serialization/Cargo.toml +++ b/plerkle_serialization/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plerkle_serialization" description = "Metaplex Flatbuffers Plerkle Serialization for Geyser plugin producer/consumer patterns." -version = "1.3.0" +version = "1.3.1" authors = ["Metaplex Developers "] repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin" license = "AGPL-3.0" @@ -10,8 +10,8 @@ readme = "Readme.md" [dependencies] flatbuffers = "22.10.26" -solana-geyser-plugin-interface = { version = ">=1.10.41" } -solana-runtime = ">=1.10.41" +solana-geyser-plugin-interface = { version = ">=1.13.6" } +solana-runtime = ">=1.13.6" chrono = "0.4.22" serde = { version = "1.0.149"} [package.metadata.docs.rs]