solana-labs · mergify · Jul 9, 2020 · Jul 1, 2020 · Jul 1, 2020 · Jul 7, 2020
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 bs58 = "0.3.1"
 Inflector = "0.11.4"
 lazy_static = "1.4.0"

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 clap = "2.33.1"
 log = "0.4.8"
 rayon = "1.3.1"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 bs58 = "0.3.1"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = "2.33.1"

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 bs58 = "0.3.1"
 indicatif = "0.15.0"
 jsonrpc-core = "14.2.0"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 bv = { version = "0.11.1", features = ["serde"] }
 bs58 = "0.3.1"
 byteorder = "1.3.4"

diff --git a/core/src/rpc.rs b/core/src/rpc.rs
@@ -5,7 +5,7 @@ use crate::{
     non_circulating_supply::calculate_non_circulating_supply, rpc_error::RpcCustomError,
     rpc_health::*, send_transaction_service::SendTransactionService, validator::ValidatorExit,
 };
-use bincode::serialize;
+use bincode::{config::Options, serialize};
 use jsonrpc_core::{Error, Metadata, Result};
 use jsonrpc_derive::rpc;
 use solana_account_decoder::{UiAccount, UiAccountEncoding};
@@ -1688,8 +1688,10 @@ fn deserialize_bs58_transaction(bs58_transaction: String) -> Result<(Vec<u8>, Tr
         info!("{}", err);
         return Err(Error::invalid_params(&err));
     }
-    bincode::config()
-        .limit(PACKET_DATA_SIZE as u64)
+    bincode::options()
+        .with_limit(PACKET_DATA_SIZE as u64)
+        .with_fixint_encoding()
+        .allow_trailing_bytes()
         .deserialize_from(&wire_transaction[..])
         .map_err(|err| {
             info!("transaction deserialize error: {:?}", err);

diff --git a/dos/Cargo.toml b/dos/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 clap = "2.33.1"
 log = "0.4.8"
 rand = "0.7.0"

diff --git a/explorer/wasm/Cargo.lock b/explorer/wasm/Cargo.lock
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 byteorder = "1.3.4"
 bytes = "0.4"
 clap = "2.33"

diff --git a/install/Cargo.toml b/install/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 
 [dependencies]
 atty = "0.2.11"
-bincode = "1.2.1"
+bincode = "1.3.1"
 bzip2 = "0.3.3"
 chrono = { version = "0.4.11", features = ["serde"] }
 clap = { version = "2.33.1" }

diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 byteorder = "1.3.4"
 chrono = { version = "0.4.11", features = ["serde"] }
 crossbeam-channel = "0.4"

diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
@@ -3,6 +3,7 @@ use crate::{
     entry::{create_ticks, Entry},
     erasure::Session,
 };
+use bincode::config::Options;
 use core::cell::RefCell;
 use rayon::{
     iter::{IndexedParallelIterator, IntoParallelRefMutIterator, ParallelIterator},
@@ -137,8 +138,10 @@ impl Shred {
     where
         T: Deserialize<'de>,
     {
-        let ret = bincode::config()
-            .limit(PACKET_DATA_SIZE as u64)
+        let ret = bincode::options()
+            .with_limit(PACKET_DATA_SIZE as u64)
+            .with_fixint_encoding()
+            .allow_trailing_bytes()
             .deserialize(&buf[*index..*index + size])?;
         *index += size;
         Ok(ret)

diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 bytes = "0.4"
 clap = "2.33.1"
 log = "0.4.8"

diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 rand = "0.7.0"
 dlopen = "0.1.8"
-bincode = "1.2.1"
+bincode = "1.3.1"
 rayon = "1.3.1"
 serde = "1.0.112"
 dlopen_derive = "0.1.4"

diff --git a/perf/src/packet.rs b/perf/src/packet.rs
@@ -1,5 +1,6 @@
 //! The `packet` module defines data structures and methods to pull data from the network.
 use crate::{cuda_runtime::PinnedVec, recycler::Recycler};
+use bincode::config::Options;
 use serde::Serialize;
 pub use solana_sdk::packet::{Meta, Packet, PACKET_DATA_SIZE};
 use std::net::SocketAddr;
@@ -100,8 +101,10 @@ pub fn limited_deserialize<T>(data: &[u8]) -> bincode::Result<T>
 where
     T: serde::de::DeserializeOwned,
 {
-    bincode::config()
-        .limit(PACKET_DATA_SIZE as u64)
+    bincode::options()
+        .with_limit(PACKET_DATA_SIZE as u64)
+        .with_fixint_encoding()
+        .allow_trailing_bytes()
         .deserialize_from(data)
 }
 

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 byteorder = "1.3.4"
 jemalloc-sys = { version = "0.3.2", features = ["disable_initial_exec_tls"] }
 num-derive = { version = "0.3" }

diff --git a/programs/btc_spv/Cargo.toml b/programs/btc_spv/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 log = "0.4.2"
 num-derive = "0.3"
 num-traits = "0.2"

diff --git a/programs/budget/Cargo.toml b/programs/budget/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 chrono = { version = "0.4.11", features = ["serde"] }
 log = "0.4.8"
 num-derive = "0.3"

diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 chrono = { version = "0.4.11", features = ["serde"] }
 log = "0.4.8"
 serde = "1.0.112"

diff --git a/programs/exchange/Cargo.toml b/programs/exchange/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-bincode = "1.2.1"
+bincode = "1.3.1"
 log = "0.4.8"
 num-derive = { version = "0.3" }
 num-traits = { version = "0.2" }