diff --git a/Api.Dockerfile b/Api.Dockerfile index c0e61f6f5..dee9c4a60 100644 --- a/Api.Dockerfile +++ b/Api.Dockerfile @@ -1,5 +1,5 @@ FROM das-api/builder AS files -FROM rust:1.81-slim-bullseye +FROM rust:1.82-slim-bullseye ARG APP=/usr/src/app RUN apt update \ && apt install -y curl ca-certificates tzdata \ diff --git a/Builder.Dockerfile b/Builder.Dockerfile index 5d932fc52..f17f0c66c 100644 --- a/Builder.Dockerfile +++ b/Builder.Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.81-bullseye AS builder +FROM rust:1.82-bullseye AS builder RUN apt-get update -y && \ apt-get install -y build-essential make git @@ -21,6 +21,6 @@ WORKDIR /rust RUN --mount=type=cache,target=/rust/target,id=das-rust \ cargo build --release --bins && cp `find /rust/target/release -maxdepth 1 -type f | sed 's/^\.\///' | grep -v "\." ` /rust/bins -FROM rust:1.81-slim-bullseye as final +FROM rust:1.82-slim-bullseye as final COPY --from=builder /rust/bins /das/ CMD echo "Built the DAS API bins!" diff --git a/Ingest.Dockerfile b/Ingest.Dockerfile index f93087b83..66a4105f3 100644 --- a/Ingest.Dockerfile +++ b/Ingest.Dockerfile @@ -1,5 +1,5 @@ FROM das-api/builder AS files -FROM rust:1.81-slim-bullseye +FROM rust:1.82-slim-bullseye ARG APP=/usr/src/app RUN apt update \ && apt install -y curl ca-certificates tzdata \ diff --git a/Load.Dockerfile b/Load.Dockerfile index 37b68e493..d87e21bdc 100644 --- a/Load.Dockerfile +++ b/Load.Dockerfile @@ -1,5 +1,5 @@ FROM das-api/builder AS files -FROM rust:1.81-slim-bullseye +FROM rust:1.82-slim-bullseye ARG APP=/usr/src/app RUN apt update \ && apt install -y curl ca-certificates tzdata \ diff --git a/Migrator.Dockerfile b/Migrator.Dockerfile index cc04e83e1..034e75df8 100644 --- a/Migrator.Dockerfile +++ b/Migrator.Dockerfile @@ -1,6 +1,6 @@ FROM das-api/builder AS files -FROM rust:1.81-bullseye +FROM rust:1.82-bullseye COPY init.sql /init.sql ENV INIT_FILE_PATH=/init.sql COPY --from=files /das/migration /bins/migration diff --git a/Proxy.Dockerfile b/Proxy.Dockerfile index 4fa1f8737..2f0176ff4 100644 --- a/Proxy.Dockerfile +++ b/Proxy.Dockerfile @@ -1,5 +1,5 @@ -FROM rust:1.81-bullseye AS builder -RUN cargo install wasm-pack +FROM rust:1.82-bullseye AS builder +RUN cargo install wasm-pack --version 0.13.1 RUN mkdir /rust COPY ./Cargo.toml /rust diff --git a/digital_asset_types/src/dapi/common/asset.rs b/digital_asset_types/src/dapi/common/asset.rs index e6ba7ccc5..a9d1ef792 100644 --- a/digital_asset_types/src/dapi/common/asset.rs +++ b/digital_asset_types/src/dapi/common/asset.rs @@ -211,7 +211,8 @@ pub fn v1_content_from_json(asset_data: &asset_data::Model) -> Result = HashMap::new(); if let Some(files) = selector("$.properties.files[*]") .ok() @@ -280,6 +281,7 @@ pub fn v1_content_from_json(asset_data: &asset_data::Model) -> Result, + #[serde(skip_serializing_if = "Option::is_none")] + pub category: Option, } #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)] diff --git a/metaplex-rpc-proxy/src/lib.rs b/metaplex-rpc-proxy/src/lib.rs index 24f60437e..665ad6376 100644 --- a/metaplex-rpc-proxy/src/lib.rs +++ b/metaplex-rpc-proxy/src/lib.rs @@ -5,6 +5,10 @@ use proxy_wasm::types::*; use regex::{Regex, RegexBuilder}; use std::time::Duration; +// Workaround: forces wasm-bindgen to include required intrinsics for proxy-wasm build. +#[allow(unused_imports)] +use wasm_bindgen::JsValue; + proxy_wasm::main! {{ proxy_wasm::set_log_level(LogLevel::Trace); proxy_wasm::set_root_context(|_| -> Box { Box::new(Root) }); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 071ff5b32..86cda942f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.81.0" +channel = "1.82.0" components = ["clippy", "rustfmt"] targets = [] profile = "minimal" diff --git a/tools/txn_forwarder/src/lib.rs b/tools/txn_forwarder/src/lib.rs index c496ab19d..89f7b8e8e 100644 --- a/tools/txn_forwarder/src/lib.rs +++ b/tools/txn_forwarder/src/lib.rs @@ -26,6 +26,7 @@ use { tokio_stream::wrappers::LinesStream, }; +#[allow(clippy::large_enum_variant)] #[derive(Debug, thiserror::Error)] pub enum FindSignaturesError { #[error("Failed to fetch signatures: {0}")]