Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Api.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions Builder.Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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!"
2 changes: 1 addition & 1 deletion Ingest.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Load.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Migrator.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Proxy.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion digital_asset_types/src/dapi/common/asset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ pub fn v1_content_from_json(asset_data: &asset_data::Model) -> Result<Content, D
links.insert(f.to_string(), l.to_owned());
}
}
let _metadata = safe_select(selector, "description");
let category = safe_select(selector, "$.properties.category").cloned();

let mut actual_files: HashMap<String, File> = HashMap::new();
if let Some(files) = selector("$.properties.files[*]")
.ok()
Expand Down Expand Up @@ -280,6 +281,7 @@ pub fn v1_content_from_json(asset_data: &asset_data::Model) -> Result<Content, D
files: Some(files),
metadata: meta,
links: Some(links),
category,
})
}

Expand Down
2 changes: 2 additions & 0 deletions digital_asset_types/src/rpc/asset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ pub struct Content {
pub metadata: MetadataMap,
#[serde(skip_serializing_if = "Option::is_none")]
pub links: Option<Links>,
#[serde(skip_serializing_if = "Option::is_none")]
pub category: Option<Value>,
}

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
Expand Down
4 changes: 4 additions & 0 deletions metaplex-rpc-proxy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<dyn RootContext> { Box::new(Root) });
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.81.0"
channel = "1.82.0"
components = ["clippy", "rustfmt"]
targets = []
profile = "minimal"
1 change: 1 addition & 0 deletions tools/txn_forwarder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}")]
Expand Down