diff --git a/Cargo.toml b/Cargo.toml index f41764b5816..e213f8167ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -216,7 +216,7 @@ aya = "0.13" aya-ebpf = "0.1.1" base64 = "0.22.1" bencher = "0.1.5" -bincode = "1.3.3" +bincode = "3.0.0" bitflags = { version = "2.11.0" } bitvec = { version = "1.0.1", features = ["serde"] } blake3 = "1.8.4" diff --git a/dev-bins/Cargo.toml b/dev-bins/Cargo.toml index 686813f6f72..5e40141a9f6 100644 --- a/dev-bins/Cargo.toml +++ b/dev-bins/Cargo.toml @@ -57,7 +57,7 @@ agave-reserved-account-keys = { path = "../reserved-account-keys", version = "=4 agave-snapshots = { path = "../snapshots", version = "=4.1.0-alpha.0", features = ["agave-unstable-api"] } ahash = "0.8.11" assert_cmd = "2.2.0" -bincode = "1.3.3" +bincode = "3.0.0" chrono = { version = "0.4.42", default-features = false } clap = { version = "2.33.1", default-features = false, features = ["suggestions"] } crossbeam-channel = "0.5.15" diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 56fba1c09f8..de0f6dbe6bd 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -149,7 +149,7 @@ name = "agave-precompiles" version = "4.1.0-alpha.0" dependencies = [ "agave-feature-set", - "bincode", + "bincode 3.0.0", "ed25519-dalek 1.0.1", "libsecp256k1", "openssl", @@ -207,7 +207,7 @@ name = "agave-snapshots" version = "4.1.0-alpha.0" dependencies = [ "agave-fs", - "bincode", + "bincode 3.0.0", "bzip2", "crossbeam-channel", "log", @@ -333,7 +333,7 @@ dependencies = [ "agave-logger", "agave-math-utils", "agave-votor-messages", - "bincode", + "bincode 3.0.0", "bitvec", "crossbeam-channel", "itertools 0.14.0", @@ -1101,6 +1101,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bincode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6a120d2e16b3e1b4a24bd70f23b12d3e16b81f113364a26935f8db7245452d" + [[package]] name = "bindgen" version = "0.72.1" @@ -5820,7 +5826,7 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bbea62563f5143b29fff5aa6af57426bc1beb77c6416b5c1c8e7d1266272c21" dependencies = [ - "bincode", + "bincode 1.3.3", "qualifier_attr", "serde", "serde_bytes", @@ -5839,7 +5845,7 @@ version = "4.1.0-alpha.0" dependencies = [ "Inflector", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "bs58", "bv", "serde", @@ -5892,7 +5898,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9cf16495d9eb53e3d04e72366a33bb1c20c24e78c171d8b8f5978357b63ae95" dependencies = [ - "bincode", + "bincode 1.3.3", "serde_core", "solana-address 2.6.0", "solana-program-error", @@ -6002,7 +6008,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115b4f773acc4f3f3cb986b0d335e9845c0368c82b0940410935bc11ae065578" dependencies = [ - "bincode", + "bincode 1.3.3", "bytemuck", "serde", "serde_derive", @@ -6072,7 +6078,7 @@ name = "solana-banks-server" version = "4.1.0-alpha.0" dependencies = [ "agave-feature-set", - "bincode", + "bincode 3.0.0", "crossbeam-channel", "futures 0.3.32", "solana-account 4.2.0", @@ -6112,7 +6118,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "278a1a5bad62cd9da89ac8d4b7ec444e83caa8ae96aa656dfc27684b28d49a5d" dependencies = [ - "bincode", + "bincode 1.3.3", "serde_core", "solana-instruction-error", ] @@ -6205,7 +6211,7 @@ dependencies = [ name = "solana-bpf-loader-program" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "qualifier_attr", "solana-account 4.2.0", "solana-bincode", @@ -6357,7 +6363,7 @@ name = "solana-client" version = "4.1.0-alpha.0" dependencies = [ "async-trait", - "bincode", + "bincode 3.0.0", "dashmap", "futures-util", "indicatif", @@ -6491,7 +6497,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e401ae56aed512821cc7a0adaa412ff97fecd2dff4602be7b1330d2daec0c4" dependencies = [ - "bincode", + "bincode 1.3.3", "serde", "serde_derive", "solana-account 3.4.0", @@ -6541,7 +6547,7 @@ dependencies = [ "arrayvec", "assert_matches", "async-trait", - "bincode", + "bincode 3.0.0", "bytes", "chrono", "crossbeam-channel", @@ -6912,7 +6918,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd7545e02f91da1d6996f32b18f7796aa01e0682f8f3a7434b82cd1a10448add" dependencies = [ - "bincode", + "bincode 1.3.3", "serde", "serde_derive", "solana-account 4.2.0", @@ -6974,7 +6980,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5415e781581524a972a3de931d1716d90c0ee08beaa1f34e3108339caf9ee450" dependencies = [ - "bincode", + "bincode 1.3.3", "chrono", "memmap2 0.5.10", "serde", @@ -7051,7 +7057,7 @@ dependencies = [ "arc-swap", "arrayvec", "assert_matches", - "bincode", + "bincode 3.0.0", "bv", "crossbeam-channel", "flate2", @@ -7158,7 +7164,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ebb0ffd19263051bc3f683fcc086134b8ff23af894dcb63f7563c7137b42f1" dependencies = [ - "bincode", + "bincode 1.3.3", "borsh", "serde", "serde_derive", @@ -7274,7 +7280,7 @@ dependencies = [ "agave-votor-messages", "anyhow", "assert_matches", - "bincode", + "bincode 3.0.0", "bitflags 2.11.0", "bytes", "bzip2", @@ -7490,7 +7496,7 @@ checksum = "ae8dd4c280dca9d046139eb5b7a5ac9ad10403fbd64964c7d7571214950d758f" name = "solana-net-utils" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "bytes", "cfg-if 1.0.4", "dashmap", @@ -7580,7 +7586,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ad62e1045c2347a0c0e219a6ceb0abfe904be622920996bfcac8d116fabe3c7" dependencies = [ - "bincode", + "bincode 1.3.3", "bitflags 2.11.0", "cfg_eval", "serde", @@ -7595,7 +7601,7 @@ version = "4.1.0-alpha.0" dependencies = [ "agave-transaction-view", "ahash 0.8.12", - "bincode", + "bincode 3.0.0", "bytes", "caps", "libc", @@ -7736,7 +7742,7 @@ dependencies = [ name = "solana-program-binaries" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "solana-account 4.2.0", "solana-loader-v3-interface", "solana-pubkey 4.2.0", @@ -7797,7 +7803,7 @@ name = "solana-program-runtime" version = "4.1.0-alpha.0" dependencies = [ "base64 0.22.1", - "bincode", + "bincode 3.0.0", "cfg-if 1.0.4", "itertools 0.14.0", "log", @@ -7846,7 +7852,7 @@ dependencies = [ "assert_matches", "async-trait", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "chrono-humanize", "log", "serde", @@ -8103,7 +8109,7 @@ version = "4.1.0-alpha.0" dependencies = [ "async-trait", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "bs58", "futures 0.3.32", "indicatif", @@ -8208,7 +8214,7 @@ dependencies = [ "arrayref", "assert_matches", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "bytemuck", "crossbeam-channel", "dashmap", @@ -8353,7 +8359,7 @@ dependencies = [ "agave-logger", "agave-reserved-account-keys", "agave-validator", - "bincode", + "bincode 3.0.0", "borsh", "solana-account 4.2.0", "solana-account-info", @@ -9023,7 +9029,7 @@ dependencies = [ name = "solana-sbf-rust-sysvar" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "solana-account-info", "solana-define-syscall 3.0.0", "solana-instruction", @@ -9360,7 +9366,7 @@ version = "4.1.0-alpha.0" dependencies = [ "agave-reserved-account-keys", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "bzip2", "enum-iterator", "flate2", @@ -9395,7 +9401,7 @@ dependencies = [ name = "solana-storage-proto" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "bs58", "prost", "protobuf-src", @@ -9534,7 +9540,7 @@ dependencies = [ name = "solana-svm-test-harness-instr" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "env_logger", "solana-account 4.2.0", "solana-bpf-loader-program", @@ -9593,7 +9599,7 @@ dependencies = [ name = "solana-syscalls" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "libsecp256k1", "num-traits", "solana-account 4.2.0", @@ -9664,7 +9670,7 @@ dependencies = [ name = "solana-system-program" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "log", "solana-account 4.2.0", "solana-bincode", @@ -9704,7 +9710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1632b69b4f72489db5949a10e8308c229dfa003f99ecaa7477b376807c7b81f4" dependencies = [ "base64 0.22.1", - "bincode", + "bincode 1.3.3", "bytemuck", "bytemuck_derive", "lazy_static", @@ -9749,7 +9755,7 @@ dependencies = [ "agave-snapshots", "arc-swap", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "crossbeam-channel", "log", "serde_json", @@ -9892,7 +9898,7 @@ dependencies = [ name = "solana-transaction-context" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "serde", "solana-account 4.2.0", "solana-instruction", @@ -9924,7 +9930,7 @@ dependencies = [ "Inflector", "agave-reserved-account-keys", "base64 0.22.1", - "bincode", + "bincode 3.0.0", "borsh", "bs58", "serde", @@ -9962,7 +9968,7 @@ name = "solana-transaction-status-client-types" version = "4.1.0-alpha.0" dependencies = [ "base64 0.22.1", - "bincode", + "bincode 3.0.0", "bs58", "serde", "serde_json", @@ -10104,7 +10110,7 @@ dependencies = [ name = "solana-vote" version = "4.1.0-alpha.0" dependencies = [ - "bincode", + "bincode 3.0.0", "log", "qualifier_attr", "rand 0.9.4", @@ -10133,7 +10139,7 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d495cb001d3373229ba523625783e5168707f70a9c38ddc90fbc5b0470d600ea" dependencies = [ - "bincode", + "bincode 1.3.3", "cfg_eval", "num-derive", "num-traits", @@ -10158,7 +10164,7 @@ name = "solana-vote-program" version = "4.1.0-alpha.0" dependencies = [ "agave-feature-set", - "bincode", + "bincode 3.0.0", "log", "solana-account 4.2.0", "solana-bincode", @@ -10209,7 +10215,7 @@ checksum = "9602bcb1f7af15caef92b91132ec2347e1c51a72ecdbefdaefa3eac4b8711475" dependencies = [ "aes-gcm-siv", "base64 0.22.1", - "bincode", + "bincode 1.3.3", "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", @@ -10246,7 +10252,7 @@ checksum = "09670ff59f60e6ddc2209c2e4353992a9b9f01d4e244f3e9d67bd5146e33d388" dependencies = [ "aes-gcm-siv", "base64 0.22.1", - "bincode", + "bincode 1.3.3", "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", @@ -10970,7 +10976,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" dependencies = [ - "bincode", + "bincode 1.3.3", "bytes", "educe 0.4.23", "futures-core", diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml index c068cc517c1..3ea3380611d 100644 --- a/programs/sbf/Cargo.toml +++ b/programs/sbf/Cargo.toml @@ -111,7 +111,7 @@ agave-logger = { path = "../../logger", version = "=4.1.0-alpha.0" } agave-reserved-account-keys = { path = "../../reserved-account-keys", version = "=4.1.0-alpha.0" } agave-validator = { path = "../../validator", version = "=4.1.0-alpha.0" } array-bytes = "=1.4.1" -bincode = { version = "1.1.4", default-features = false } +bincode = { version = "3.0.0", default-features = false } blake3 = "1.0.0" borsh = "1.5.1" byteorder = "1.3.2"