diff --git a/Cargo.lock b/Cargo.lock index fb9ee5a65a..7f55f9ccaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3472,9 +3472,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.112" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] @@ -3500,9 +3500,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.112" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.6", diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index d0be6b7ce3..ff99d1894c 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -15,7 +15,7 @@ bs58 = "0.3.1" bv = "0.11.1" Inflector = "0.11.4" lazy_static = "1.4.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_json = "1.0.56" solana-config-program = { path = "../programs/config", version = "1.6.0" } diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml index 43e19fe9ba..d08b611e8b 100644 --- a/banks-interface/Cargo.toml +++ b/banks-interface/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] mio = "0.7.6" -serde = { version = "1.0.112", features = ["derive"] } +serde = { version = "1.0.118", features = ["derive"] } solana-sdk = { path = "../sdk", version = "1.6.0" } tarpc = { version = "0.23.0", features = ["full"] } diff --git a/cli-config/Cargo.toml b/cli-config/Cargo.toml index 9d2cb1deee..d9146a01e0 100644 --- a/cli-config/Cargo.toml +++ b/cli-config/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" [dependencies] dirs-next = "2.0.0" lazy_static = "1.4.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_yaml = "0.8.13" url = "2.1.1" diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml index 3ebbd54f49..f37afaa885 100644 --- a/cli-output/Cargo.toml +++ b/cli-output/Cargo.toml @@ -14,7 +14,7 @@ console = "0.11.3" humantime = "2.0.1" Inflector = "0.11.4" indicatif = "0.15.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_json = "1.0.56" solana-account-decoder = { path = "../account-decoder", version = "1.6.0" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8bcd9a9d08..c84e68a2fe 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,7 +24,7 @@ humantime = "2.0.1" num-traits = "0.2" pretty-hex = "0.2.1" reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_json = "1.0.56" solana-account-decoder = { path = "../account-decoder", version = "1.6.0" } diff --git a/client/Cargo.toml b/client/Cargo.toml index abe2675748..6651552569 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -20,7 +20,7 @@ net2 = "0.2.37" rayon = "1.5.0" reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "0.11.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_json = "1.0.56" solana-account-decoder = { path = "../account-decoder", version = "1.6.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index c59a5770be..735cc15aa5 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -45,7 +45,7 @@ raptorq = "1.4.2" rayon = "1.5.0" regex = "1.3.9" rustversion = "1.0.4" -serde = "1.0.112" +serde = "1.0.118" serde_bytes = "0.11" serde_derive = "1.0.103" serde_json = "1.0.56" diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index dacddc70b2..5168c51a8a 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -405,7 +405,7 @@ pub fn make_accounts_hashes_message( type Ping = ping_pong::Ping<[u8; GOSSIP_PING_TOKEN_SIZE]>; // TODO These messages should go through the gpu pipeline for spam filtering -#[frozen_abi(digest = "DdTxrwwnbe571Di4rLtrAQorFDE58vYnmzzbaeQ7sQMC")] +#[frozen_abi(digest = "CH5BWuhAyvUiUQYgu2Lcwu7eoiW6bQitvtLS1yFsdmrE")] #[derive(Serialize, Deserialize, Debug, AbiEnumVisitor, AbiExample)] #[allow(clippy::large_enum_variant)] enum Protocol { diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index c3ab5aabcf..14b6055788 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" byteorder = "1.3.4" clap = "2.33" log = "0.4.11" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-cli-config = { path = "../cli-config", version = "1.6.0" } diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml index c1aef9394a..6116e5a53c 100644 --- a/frozen-abi/Cargo.toml +++ b/frozen-abi/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bs58 = "0.3.1" bv = { version = "0.11.1", features = ["serde"] } log = "0.4.11" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" sha2 = "0.9.2" solana-frozen-abi-macro = { path = "macro", version = "1.6.0" } diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index c39d9f9623..e53e5bbab9 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://solana.com/" base64 = "0.12.3" clap = "2.33.1" chrono = "0.4" -serde = "1.0.112" +serde = "1.0.118" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-budget-program = { path = "../programs/budget", version = "1.6.0" } diff --git a/install/Cargo.toml b/install/Cargo.toml index 5edf049080..1651195a11 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -21,7 +21,7 @@ indicatif = "0.15.0" lazy_static = "1.4.0" nix = "0.19.0" reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 3931b2e2b2..7b47533acc 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -30,7 +30,7 @@ rand = "0.7.0" rand_chacha = "0.2.2" rayon = "1.5.0" reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } -serde = "1.0.112" +serde = "1.0.118" serde_bytes = "0.11.4" sha2 = "0.9.2" solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "1.6.0" } diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml index 041f9c538e..f176fa1f50 100644 --- a/log-analyzer/Cargo.toml +++ b/log-analyzer/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] byte-unit = "4.0.9" clap = "2.33.1" -serde = "1.0.112" +serde = "1.0.118" serde_json = "1.0.56" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-logger = { path = "../logger", version = "1.6.0" } diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml index 973b329a5a..c82db45c33 100644 --- a/net-shaper/Cargo.toml +++ b/net-shaper/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] clap = "2.33.1" -serde = "1.0.112" +serde = "1.0.118" serde_json = "1.0.56" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-logger = { path = "../logger", version = "1.6.0" } diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml index f0483154fa..047a32ba74 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -14,7 +14,7 @@ clap = "2.33.1" log = "0.4.11" nix = "0.19.0" rand = "0.7.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" socket2 = "0.3.17" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } diff --git a/perf/Cargo.toml b/perf/Cargo.toml index d404456e6d..51e42abeaf 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -13,7 +13,7 @@ rand = "0.7.0" dlopen = "0.1.8" bincode = "1.3.1" rayon = "1.5.0" -serde = "1.0.112" +serde = "1.0.118" dlopen_derive = "0.1.4" lazy_static = "1.4.0" log = "0.4.11" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 7d9d09eaef..d06c3941fc 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -2355,9 +2355,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.112" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] @@ -2373,9 +2373,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.112" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.6", diff --git a/programs/budget/Cargo.toml b/programs/budget/Cargo.toml index 8efa8bf4e7..7b682d487a 100644 --- a/programs/budget/Cargo.toml +++ b/programs/budget/Cargo.toml @@ -14,7 +14,7 @@ chrono = { version = "0.4.11", features = ["serde"] } log = "0.4.11" num-derive = "0.3" num-traits = "0.2" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-sdk = { path = "../../sdk", version = "1.6.0" } thiserror = "1.0" diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml index f8127f2c49..6ba67859b2 100644 --- a/programs/config/Cargo.toml +++ b/programs/config/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bincode = "1.3.1" chrono = { version = "0.4.11", features = ["serde"] } log = "0.4.11" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-sdk = { path = "../../sdk", version = "1.6.0" } diff --git a/programs/exchange/Cargo.toml b/programs/exchange/Cargo.toml index 450ceab6a7..349e97efc2 100644 --- a/programs/exchange/Cargo.toml +++ b/programs/exchange/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" log = "0.4.11" num-derive = { version = "0.3" } num-traits = { version = "0.2" } -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-logger = { path = "../../logger", version = "1.6.0" } solana-metrics = { path = "../../metrics", version = "1.6.0" } diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml index 004ea82e9c..196f0d0a0b 100644 --- a/programs/stake/Cargo.toml +++ b/programs/stake/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" log = "0.4.11" num-derive = "0.3" num-traits = "0.2" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-frozen-abi = { path = "../../frozen-abi", version = "1.6.0" } solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "1.6.0" } diff --git a/programs/vest/Cargo.toml b/programs/vest/Cargo.toml index 493eea97d1..6bccac05db 100644 --- a/programs/vest/Cargo.toml +++ b/programs/vest/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" chrono = { version = "0.4.11", features = ["serde"] } num-derive = "0.3" num-traits = "0.2" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-sdk = { path = "../../sdk", version = "1.6.0" } solana-config-program = { path = "../config", version = "1.6.0" } diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml index 13099008eb..67fd5896fa 100644 --- a/programs/vote/Cargo.toml +++ b/programs/vote/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" log = "0.4.11" num-derive = "0.3" num-traits = "0.2" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-frozen-abi = { path = "../../frozen-abi", version = "1.6.0" } solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "1.6.0" } diff --git a/ramp-tps/Cargo.toml b/ramp-tps/Cargo.toml index aaad44fb12..ad5171c954 100644 --- a/ramp-tps/Cargo.toml +++ b/ramp-tps/Cargo.toml @@ -13,7 +13,7 @@ bzip2 = "0.3.3" clap = "2.33.1" log = "0.4.11" reqwest = { version = "0.10.8", default-features = false } -serde = "1.0.112" +serde = "1.0.118" serde_json = "1.0.56" serde_yaml = "0.8.13" solana-core = { path = "../core", version = "1.6.0" } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 64c13e737d..7212cce3c2 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -33,7 +33,7 @@ ouroboros = "0.5.1" rand = "0.7.0" rayon = "1.5.0" regex = "1.3.9" -serde = { version = "1.0.112", features = ["rc"] } +serde = { version = "1.0.118", features = ["rc"] } serde_derive = "1.0.103" solana-config-program = { path = "../programs/config", version = "1.6.0" } solana-frozen-abi = { path = "../frozen-abi", version = "1.6.0" } diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index 710c254883..14671d827a 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -268,7 +268,7 @@ mod test_bank_serialize { // These some what long test harness is required to freeze the ABI of // Bank's serialization due to versioned nature - #[frozen_abi(digest = "Gv3em1cZt9cjQWepg8C5aaK95deyA1fifowRfmmTuoES")] + #[frozen_abi(digest = "9CqwEeiVycBp9wVDLz19XUJXRMZ68itGfYVEe29S8JmA")] #[derive(Serialize, AbiExample)] pub struct BankAbiTestWrapperFuture { #[serde(serialize_with = "wrapper_future")] diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml index 72af45256c..da6a7d9628 100644 --- a/scripts/Cargo.toml +++ b/scripts/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] csv = "1.1" -serde = { version = "1.0.112", features = ["derive"] } +serde = { version = "1.0.118", features = ["derive"] } [[bin]] name = "solana-csv-to-validator-infos" diff --git a/scripts/build-downstream-projects.sh b/scripts/build-downstream-projects.sh index eab301858b..bce8a02d31 100755 --- a/scripts/build-downstream-projects.sh +++ b/scripts/build-downstream-projects.sh @@ -83,14 +83,16 @@ serum_dex() { rm -rf serum-dex git clone https://github.com/project-serum/serum-dex.git cd serum-dex - # TODO: Remove next line and debug build failure - git checkout 54400763dbcc64bc955621298f0bada33b591f53 update_solana_dependencies . patch_crates_io Cargo.toml patch_crates_io dex/Cargo.toml - echo "[workspace]" >> dex/Cargo.toml - + cat >> dex/Cargo.toml < for TransactionError { } /// An atomic transaction -#[frozen_abi(digest = "EGPL8qfT6of8UDKUTPQfcCADiRrpVxKXmULWtNdfjbQ8")] +#[frozen_abi(digest = "2Kr1C1pRytLsmUbg8p2nLoZyrjrEQCriAYLTCYvwj1Fo")] #[derive(Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize, AbiExample)] pub struct Transaction { /// A set of digital signatures of `account_keys`, `program_ids`, `recent_blockhash`, and `instructions`, signed by the first diff --git a/stake-monitor/Cargo.toml b/stake-monitor/Cargo.toml index 59833e5afa..47081c1931 100644 --- a/stake-monitor/Cargo.toml +++ b/stake-monitor/Cargo.toml @@ -12,7 +12,7 @@ homepage = "https://solana.com/" clap = "2.33.1" console = "0.11.3" log = "0.4.11" -serde = "1.0.112" +serde = "1.0.118" serde_yaml = "0.8.13" solana-clap-utils = { path = "../clap-utils", version = "1.6.0" } solana-cli-config = { path = "../cli-config", version = "1.6.0" } diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml index 125d018b67..b5d3aedc58 100644 --- a/storage-bigtable/Cargo.toml +++ b/storage-bigtable/Cargo.toml @@ -19,7 +19,7 @@ goauth = "0.8.1" log = "0.4.11" prost = "0.6.1" prost-types = "0.6.1" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" smpl_jwt = "0.5.0" solana-sdk = { path = "../sdk", version = "1.6.0" } diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml index 2ed3992f95..25cc779035 100644 --- a/storage-proto/Cargo.toml +++ b/storage-proto/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bincode = "1.2.1" bs58 = "0.3.1" prost = "0.6.1" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-account-decoder = { path = "../account-decoder", version = "1.6.0" } solana-sdk = { path = "../sdk", version = "1.6.0" } diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index 03b9561fd3..18df098686 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -14,7 +14,7 @@ bincode = "1.3.1" bs58 = "0.3.1" Inflector = "0.11.4" lazy_static = "1.4.0" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" serde_json = "1.0.56" solana-account-decoder = { path = "../account-decoder", version = "1.6.0" } diff --git a/version/Cargo.toml b/version/Cargo.toml index f338b3a125..ba0a049fa6 100644 --- a/version/Cargo.toml +++ b/version/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dependencies] log = "0.4.11" -serde = "1.0.112" +serde = "1.0.118" serde_derive = "1.0.103" solana-frozen-abi = { path = "../frozen-abi", version = "1.6.0" } solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "1.6.0" }