diff --git a/Cargo.lock b/Cargo.lock index 7948f0391a..9c9c5ec220 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,11 +660,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300ca295b46d7c8a955a4b07436b5d308c9b2842885642ed17d91f22215e5f44" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ - "borsh-derive 0.11.0", + "borsh-derive 0.10.3", "hashbrown 0.13.2", ] @@ -683,12 +683,12 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d249fd10f635502b30ef6fa2b5f6407d37a3f8657ab3e8143ef7a8ff78849695" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" dependencies = [ - "borsh-derive-internal 0.11.0", - "borsh-schema-derive-internal 0.11.0", + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", "proc-macro2 1.0.59", "syn 1.0.109", @@ -707,9 +707,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4019c962c2526569c6bda1657094a43434b0eed196b3f3af27b9f6811de12417" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ "proc-macro2 1.0.59", "quote 1.0.28", @@ -729,9 +729,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89ac467d675ff862c2aea7e2eb103e170f649692de6ffa40250b0031f801bfc" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ "proc-macro2 1.0.59", "quote 1.0.28", @@ -5030,7 +5030,7 @@ dependencies = [ name = "solana-banks-client" version = "1.17.0" dependencies = [ - "borsh 0.11.0", + "borsh 0.10.3", "futures 0.3.28", "solana-banks-interface", "solana-banks-server", @@ -6201,7 +6201,7 @@ dependencies = [ "bincode", "bitflags", "blake3", - "borsh 0.11.0", + "borsh 0.10.3", "bs58", "bv", "bytemuck", @@ -6608,7 +6608,7 @@ dependencies = [ "base64 0.21.2", "bincode", "bitflags", - "borsh 0.11.0", + "borsh 0.10.3", "bs58", "bytemuck", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 05c07e6191..bed20443b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -143,7 +143,7 @@ bincode = "1.3.3" bitflags = "1.3.1" blake3 = "1.3.3" block-buffer = "0.10.4" -borsh = "0.11.0" +borsh = "0.10.3" bs58 = "0.4.0" bv = "0.11.1" byte-unit = "4.0.19" diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 6158838b30..606ca28a39 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -631,11 +631,11 @@ dependencies = [ [[package]] name = "borsh" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300ca295b46d7c8a955a4b07436b5d308c9b2842885642ed17d91f22215e5f44" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ - "borsh-derive 0.11.0", + "borsh-derive 0.10.3", "hashbrown 0.13.2", ] @@ -654,12 +654,12 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d249fd10f635502b30ef6fa2b5f6407d37a3f8657ab3e8143ef7a8ff78849695" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" dependencies = [ - "borsh-derive-internal 0.11.0", - "borsh-schema-derive-internal 0.11.0", + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", "proc-macro2 1.0.59", "syn 1.0.109", @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "borsh-derive-internal" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4019c962c2526569c6bda1657094a43434b0eed196b3f3af27b9f6811de12417" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ "proc-macro2 1.0.59", "quote 1.0.28", @@ -700,9 +700,9 @@ dependencies = [ [[package]] name = "borsh-schema-derive-internal" -version = "0.11.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89ac467d675ff862c2aea7e2eb103e170f649692de6ffa40250b0031f801bfc" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ "proc-macro2 1.0.59", "quote 1.0.28", @@ -4482,7 +4482,7 @@ dependencies = [ name = "solana-banks-client" version = "1.17.0" dependencies = [ - "borsh 0.11.0", + "borsh 0.10.3", "futures 0.3.28", "solana-banks-interface", "solana-program", @@ -5136,7 +5136,7 @@ dependencies = [ "bincode", "bitflags", "blake3", - "borsh 0.11.0", + "borsh 0.10.3", "bs58", "bv", "bytemuck", @@ -5878,7 +5878,7 @@ dependencies = [ "base64 0.21.2", "bincode", "bitflags", - "borsh 0.11.0", + "borsh 0.10.3", "bs58", "bytemuck", "byteorder 1.4.3", diff --git a/sdk/src/compute_budget.rs b/sdk/src/compute_budget.rs index 0038fe084e..84d0c37660 100644 --- a/sdk/src/compute_budget.rs +++ b/sdk/src/compute_budget.rs @@ -1,16 +1,6 @@ //! The compute budget native program. -//! -//! WARNING: This file allows integer arithmetic. Borsh 0.11 performs safe integer -//! arithmetic at compile-time, but clippy cannot properly detect that currently. -//! -//! With the resolution of https://github.com/rust-lang/rust-clippy/issues/6365, -//! we can remove this `allow` statement. -//! -//! In the meantime, do not add any other logic to this file, to avoid adding -//! potentially harmful integer math. #![cfg(feature = "full")] -#![allow(clippy::integer_arithmetic)] use { crate::instruction::Instruction,