From 01d749185b344e9b0bd36c2c3282f26228451ffb Mon Sep 17 00:00:00 2001 From: Ashok Menon Date: Sun, 15 Sep 2024 00:05:45 +0100 Subject: [PATCH 1/2] pick(rest): discard failed dynamic field indices ## Description Allow dynamic field indexing to fail when building up fullnode REST indices to bring it in line with behaviour in `sui-indexer`, `sui-analytics-indexer`, and the existing fullnode indices. ## Test plan CI --- crates/sui-core/src/rest_index.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/sui-core/src/rest_index.rs b/crates/sui-core/src/rest_index.rs index ade98f8ada4dd..7e16553172beb 100644 --- a/crates/sui-core/src/rest_index.rs +++ b/crates/sui-core/src/rest_index.rs @@ -452,7 +452,9 @@ impl IndexStoreTables { } Owner::ObjectOwner(parent) => { if let Some(field_info) = - try_create_dynamic_field_info(object, resolver)? + try_create_dynamic_field_info(object, resolver) + .ok() + .flatten() { let field_key = DynamicFieldKey::new(*parent, object.id()); From b8cd3d6c91aafe0527b5e3b5a26534ec2b1d5ad7 Mon Sep 17 00:00:00 2001 From: Ashok Menon Date: Mon, 16 Sep 2024 11:22:29 +0100 Subject: [PATCH 2/2] fixup: pick cargo deny fixes --- Cargo.lock | 6 +++--- deny.toml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4118256759b7a..73d1891905bcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10235,9 +10235,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", @@ -16471,7 +16471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] diff --git a/deny.toml b/deny.toml index b1f837e63143e..c5b514a742b35 100644 --- a/deny.toml +++ b/deny.toml @@ -34,6 +34,8 @@ ignore = [ "RUSTSEC-2024-0336", # allow yaml-rust being unmaintained "RUSTSEC-2024-0320", + # allow unmaintained proc-macro-error used in transitive dependencies + "RUSTSEC-2024-0370", ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories