From f06a4c78619a6214c2e2c30ac05a0213819d7a87 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 31 Jul 2020 22:10:57 -0700 Subject: [PATCH] Update spl-token and spl-memo --- Cargo.lock | 359 ++++++++++++++++------------- account-decoder/Cargo.toml | 2 +- account-decoder/src/parse_token.rs | 15 +- core/Cargo.toml | 2 +- core/src/rpc.rs | 15 +- transaction-status/Cargo.toml | 4 +- 6 files changed, 224 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be73dee881..c9f904e989 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -253,7 +253,7 @@ dependencies = [ [[package]] name = "btc_spv_bin" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "hex", @@ -2978,7 +2978,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.2.17" +version = "1.2.18" dependencies = [ "Inflector", "bincode", @@ -2987,7 +2987,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-vote-program", "spl-token", "thiserror", @@ -2995,22 +2995,22 @@ dependencies = [ [[package]] name = "solana-accounts-bench" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "crossbeam-channel", "log 0.4.8", "rand 0.7.3", "rayon", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-banking-bench" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "crossbeam-channel", @@ -3020,18 +3020,18 @@ dependencies = [ "solana-clap-utils", "solana-core", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-perf", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-streamer", "solana-version", ] [[package]] name = "solana-bench-exchange" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "itertools", @@ -3049,21 +3049,21 @@ dependencies = [ "solana-faucet", "solana-genesis", "solana-local-cluster", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-net-utils", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", ] [[package]] name = "solana-bench-streamer" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", "solana-net-utils", "solana-streamer", "solana-version", @@ -3071,7 +3071,7 @@ dependencies = [ [[package]] name = "solana-bench-tps" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "clap", @@ -3087,18 +3087,18 @@ dependencies = [ "solana-faucet", "solana-genesis", "solana-local-cluster", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-metrics", "solana-net-utils", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", ] [[package]] name = "solana-bpf-loader-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "byteorder", @@ -3108,16 +3108,16 @@ dependencies = [ "num-traits", "rand 0.7.3", "rustversion", - "solana-logger", + "solana-logger 1.2.18", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana_rbpf", "thiserror", ] [[package]] name = "solana-btc-spv-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "hex", @@ -3126,12 +3126,12 @@ dependencies = [ "num-traits", "serde", "serde_derive", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-budget-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "chrono", @@ -3141,19 +3141,19 @@ dependencies = [ "serde", "serde_derive", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-clap-utils" -version = "1.2.17" +version = "1.2.18" dependencies = [ "chrono", "clap", "rpassword", "solana-remote-wallet", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", "tiny-bip39", "url 2.1.1", @@ -3161,7 +3161,7 @@ dependencies = [ [[package]] name = "solana-cli" -version = "1.2.17" +version = "1.2.18" dependencies = [ "Inflector", "bincode", @@ -3189,11 +3189,11 @@ dependencies = [ "solana-config-program", "solana-core", "solana-faucet", - "solana-logger", + "solana-logger 1.2.18", "solana-net-utils", "solana-remote-wallet", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", "solana-version", @@ -3206,7 +3206,7 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.2.17" +version = "1.2.18" dependencies = [ "dirs", "lazy_static", @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_matches", "bincode", @@ -3233,9 +3233,9 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-logger", + "solana-logger 1.2.18", "solana-net-utils", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-transaction-status", "solana-vote-program", "thiserror", @@ -3245,20 +3245,20 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "chrono", "log 0.4.8", "serde", "serde_derive", - "solana-logger", - "solana-sdk 1.2.17", + "solana-logger 1.2.18", + "solana-sdk 1.2.18", ] [[package]] name = "solana-core" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "bs58", @@ -3300,7 +3300,7 @@ dependencies = [ "solana-faucet", "solana-genesis-programs", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-merkle-tree", "solana-metrics", @@ -3308,7 +3308,7 @@ dependencies = [ "solana-perf", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-streamer", "solana-sys-tuner", @@ -3330,6 +3330,31 @@ dependencies = [ [[package]] name = "solana-crate-features" version = "1.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610ba71932d0bf4abf88eabb081ee43fa1ee6bb5137c4fa6776ea9dd8630ca5c" +dependencies = [ + "backtrace", + "bytes 0.4.12", + "cc", + "curve25519-dalek", + "ed25519-dalek", + "either", + "failure", + "lazy_static", + "libc", + "rand_chacha 0.2.2", + "regex-syntax", + "reqwest", + "serde", + "syn 0.15.44", + "syn 1.0.33", + "tokio 0.1.22", + "winapi 0.3.8", +] + +[[package]] +name = "solana-crate-features" +version = "1.2.18" dependencies = [ "backtrace", "bytes 0.4.12", @@ -3352,7 +3377,7 @@ dependencies = [ [[package]] name = "solana-dos" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "clap", @@ -3362,16 +3387,16 @@ dependencies = [ "solana-clap-utils", "solana-core", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-net-utils", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", ] [[package]] name = "solana-download-utils" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bzip2", "console 0.10.3", @@ -3379,13 +3404,13 @@ dependencies = [ "log 0.4.8", "reqwest", "solana-ledger", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "tar", ] [[package]] name = "solana-exchange-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "log 0.4.8", @@ -3393,24 +3418,24 @@ dependencies = [ "num-traits", "serde", "serde_derive", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-failure-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-faucet" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "byteorder", @@ -3420,9 +3445,9 @@ dependencies = [ "serde", "serde_derive", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", "tokio 0.1.22", "tokio-codec", @@ -3430,7 +3455,7 @@ dependencies = [ [[package]] name = "solana-genesis" -version = "1.2.17" +version = "1.2.18" dependencies = [ "base64 0.12.2", "chrono", @@ -3441,8 +3466,8 @@ dependencies = [ "solana-clap-utils", "solana-genesis-programs", "solana-ledger", - "solana-logger", - "solana-sdk 1.2.17", + "solana-logger 1.2.18", + "solana-sdk 1.2.18", "solana-stake-program", "solana-version", "solana-vote-program", @@ -3451,34 +3476,34 @@ dependencies = [ [[package]] name = "solana-genesis-programs" -version = "1.2.17" +version = "1.2.18" dependencies = [ "log 0.4.8", "solana-bpf-loader-program", "solana-budget-program", "solana-exchange-program", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-vest-program", ] [[package]] name = "solana-gossip" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "solana-clap-utils", "solana-client", "solana-core", - "solana-logger", + "solana-logger 1.2.18", "solana-net-utils", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", ] [[package]] name = "solana-install" -version = "1.2.17" +version = "1.2.18" dependencies = [ "atty", "bincode", @@ -3499,8 +3524,8 @@ dependencies = [ "solana-clap-utils", "solana-client", "solana-config-program", - "solana-logger", - "solana-sdk 1.2.17", + "solana-logger 1.2.18", + "solana-sdk 1.2.18", "solana-version", "tar", "tempdir", @@ -3511,7 +3536,7 @@ dependencies = [ [[package]] name = "solana-keygen" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bs58", "clap", @@ -3520,14 +3545,14 @@ dependencies = [ "solana-clap-utils", "solana-cli-config", "solana-remote-wallet", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", "tiny-bip39", ] [[package]] name = "solana-ledger" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_matches", "bincode", @@ -3558,14 +3583,14 @@ dependencies = [ "sha2", "solana-budget-program", "solana-genesis-programs", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-merkle-tree", "solana-metrics", "solana-perf", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", "solana-vote-program", @@ -3579,7 +3604,7 @@ dependencies = [ [[package]] name = "solana-ledger-tool" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_cmd", "bs58", @@ -3594,9 +3619,9 @@ dependencies = [ "solana-clap-utils", "solana-cli", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", "solana-version", @@ -3606,7 +3631,7 @@ dependencies = [ [[package]] name = "solana-local-cluster" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_matches", "itertools", @@ -3622,10 +3647,10 @@ dependencies = [ "solana-faucet", "solana-genesis-programs", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-rayon-threadlimit", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-vest-program", "solana-vote-program", @@ -3634,20 +3659,31 @@ dependencies = [ [[package]] name = "solana-log-analyzer" -version = "1.2.17" +version = "1.2.18" dependencies = [ "byte-unit", "clap", "serde", "serde_json", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", "solana-version", ] [[package]] name = "solana-logger" version = "1.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc703cb2807e9d713f70df32ac8c3a7a9c8af437dd0d468b1b77cfd8e8b4cbc8" +dependencies = [ + "env_logger", + "lazy_static", + "log 0.4.8", +] + +[[package]] +name = "solana-logger" +version = "1.2.18" dependencies = [ "env_logger", "lazy_static", @@ -3656,27 +3692,27 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.2.17" +version = "1.2.18" dependencies = [ "jemalloc-ctl", "jemallocator", "log 0.4.8", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-merkle-tree" -version = "1.2.17" +version = "1.2.18" dependencies = [ "fast-math", "hex", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-metrics" -version = "1.2.17" +version = "1.2.18" dependencies = [ "env_logger", "gethostname", @@ -3686,24 +3722,24 @@ dependencies = [ "reqwest", "serial_test", "serial_test_derive", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-net-shaper" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "rand 0.7.3", "serde", "serde_json", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", ] [[package]] name = "solana-net-utils" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "bytes 0.4.12", @@ -3715,7 +3751,7 @@ dependencies = [ "serde_derive", "socket2", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", "solana-version", "tokio 0.1.22", "tokio-codec", @@ -3723,16 +3759,16 @@ dependencies = [ [[package]] name = "solana-noop-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "log 0.4.8", - "solana-logger", - "solana-sdk 1.2.17", + "solana-logger 1.2.18", + "solana-sdk 1.2.18", ] [[package]] name = "solana-notifier" -version = "1.2.17" +version = "1.2.18" dependencies = [ "log 0.4.8", "reqwest", @@ -3741,19 +3777,19 @@ dependencies = [ [[package]] name = "solana-ownable" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "num-derive 0.3.0", "num-traits", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-perf" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "curve25519-dalek", @@ -3766,15 +3802,15 @@ dependencies = [ "rayon", "serde", "solana-budget-program", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-ramp-tps" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bzip2", "clap", @@ -3785,18 +3821,18 @@ dependencies = [ "serde_yaml", "solana-client", "solana-core", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-net-utils", "solana-notifier", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "tar", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.2.17" +version = "1.2.18" dependencies = [ "lazy_static", "num_cpus", @@ -3804,7 +3840,7 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.2.17" +version = "1.2.18" dependencies = [ "base32", "console 0.10.3", @@ -3815,14 +3851,14 @@ dependencies = [ "num-traits", "parking_lot 0.10.2", "semver", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", "url 2.1.1", ] [[package]] name = "solana-runtime" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_matches", "bincode", @@ -3844,12 +3880,12 @@ dependencies = [ "serde", "serde_derive", "solana-config-program", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-metrics", "solana-noop-program", "solana-rayon-threadlimit", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-vote-program", "tempfile", @@ -3858,7 +3894,7 @@ dependencies = [ [[package]] name = "solana-scripts" -version = "1.2.17" +version = "1.2.18" dependencies = [ "csv", "serde", @@ -3866,33 +3902,44 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.2.13" +version = "1.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae779f912f1cbe2fe91df656ecc5ccdda9dd3378c0934f4390b7ba33501b3dc" +checksum = "a556c1b456609b760ff47b933912f27563ea8a9a1692864cbc1014c02f5b981e" dependencies = [ + "assert_matches", "bincode", "bs58", "bv", + "byteorder", + "chrono", + "ed25519-dalek", + "generic-array 0.14.2", "hex", "hmac", "itertools", "log 0.4.8", + "memmap", "num-derive 0.3.0", "num-traits", "pbkdf2", + "rand 0.7.3", + "rand_chacha 0.2.2", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", + "serde_json", "sha2", - "solana-sdk-macro 1.2.16", + "solana-crate-features 1.2.17", + "solana-logger 1.2.17", + "solana-sdk-macro 1.2.17", "thiserror", ] [[package]] name = "solana-sdk" -version = "1.2.17" +version = "1.2.18" dependencies = [ "assert_matches", "bincode", @@ -3920,18 +3967,18 @@ dependencies = [ "serde_derive", "serde_json", "sha2", - "solana-crate-features", - "solana-logger", - "solana-sdk-macro 1.2.17", + "solana-crate-features 1.2.18", + "solana-logger 1.2.18", + "solana-sdk-macro 1.2.18", "thiserror", "tiny-bip39", ] [[package]] name = "solana-sdk-macro" -version = "1.2.16" +version = "1.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8318768bf97be7a83abdd0d41fb08ae1b89f3bc6e0f3cd5606dc34788b2e0a4" +checksum = "38bc386020de692562a29c0696a71c14a3d94455a9a785a97c7b254c38d6a2c8" dependencies = [ "bs58", "proc-macro2 1.0.18", @@ -3942,7 +3989,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bs58", "proc-macro2 1.0.18", @@ -3953,7 +4000,7 @@ dependencies = [ [[package]] name = "solana-stake-accounts" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "solana-clap-utils", @@ -3961,13 +4008,13 @@ dependencies = [ "solana-client", "solana-remote-wallet", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", ] [[package]] name = "solana-stake-monitor" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "console 0.10.3", @@ -3981,9 +4028,9 @@ dependencies = [ "solana-client", "solana-core", "solana-local-cluster", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", "solana-version", @@ -3992,7 +4039,7 @@ dependencies = [ [[package]] name = "solana-stake-o-matic" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "log 0.4.8", @@ -4000,17 +4047,17 @@ dependencies = [ "solana-clap-utils", "solana-cli-config", "solana-client", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-notifier", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", ] [[package]] name = "solana-stake-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "log 0.4.8", @@ -4019,38 +4066,38 @@ dependencies = [ "serde", "serde_derive", "solana-config-program", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-vote-program", "thiserror", ] [[package]] name = "solana-streamer" -version = "1.2.17" +version = "1.2.18" dependencies = [ "libc", "log 0.4.8", "nix", - "solana-logger", + "solana-logger 1.2.18", "solana-measure", "solana-metrics", "solana-perf", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-sys-tuner" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "libc", "log 0.4.8", "nix", "solana-clap-utils", - "solana-logger", + "solana-logger 1.2.18", "solana-version", "sysctl", "unix_socket2", @@ -4059,7 +4106,7 @@ dependencies = [ [[package]] name = "solana-tokens" -version = "1.2.17" +version = "1.2.18" dependencies = [ "chrono", "clap", @@ -4076,7 +4123,7 @@ dependencies = [ "solana-core", "solana-remote-wallet", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-stake-program", "solana-transaction-status", "tempfile", @@ -4085,7 +4132,7 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.2.17" +version = "1.2.18" dependencies = [ "Inflector", "bincode", @@ -4095,7 +4142,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "spl-memo", "spl-token", "thiserror", @@ -4103,7 +4150,7 @@ dependencies = [ [[package]] name = "solana-upload-perf" -version = "1.2.17" +version = "1.2.18" dependencies = [ "serde_json", "solana-metrics", @@ -4111,7 +4158,7 @@ dependencies = [ [[package]] name = "solana-validator" -version = "1.2.17" +version = "1.2.18" dependencies = [ "chrono", "clap", @@ -4127,12 +4174,12 @@ dependencies = [ "solana-download-utils", "solana-faucet", "solana-ledger", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-net-utils", "solana-perf", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", "solana-vote-program", "solana-vote-signer", @@ -4140,16 +4187,16 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.2.17" +version = "1.2.18" dependencies = [ "serde", "serde_derive", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", ] [[package]] name = "solana-vest-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "chrono", @@ -4159,13 +4206,13 @@ dependencies = [ "serde_derive", "solana-config-program", "solana-runtime", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-vote-program" -version = "1.2.17" +version = "1.2.18" dependencies = [ "bincode", "log 0.4.8", @@ -4174,13 +4221,13 @@ dependencies = [ "serde", "serde_derive", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "thiserror", ] [[package]] name = "solana-vote-signer" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "jsonrpc-core", @@ -4190,13 +4237,13 @@ dependencies = [ "serde_json", "solana-clap-utils", "solana-metrics", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-version", ] [[package]] name = "solana-watchtower" -version = "1.2.17" +version = "1.2.18" dependencies = [ "clap", "humantime 2.0.1", @@ -4205,10 +4252,10 @@ dependencies = [ "solana-cli", "solana-cli-config", "solana-client", - "solana-logger", + "solana-logger 1.2.18", "solana-metrics", "solana-notifier", - "solana-sdk 1.2.17", + "solana-sdk 1.2.18", "solana-transaction-status", "solana-version", "solana-vote-program", @@ -4240,24 +4287,24 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spl-memo" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451acd972c0ed2d114c42f8fffdd9a6007840e51fe7791f250d183e72c8ff7b5" +checksum = "b303bab17e0c696de6d7550ba6f05a5a6dbf5c5d1597e68a4592899072e1c07a" dependencies = [ - "solana-sdk 1.2.13", + "solana-sdk 1.2.17", ] [[package]] name = "spl-token" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1088b10ccb61c5f4f770dd46f643e8e2e7c70aeeda4e298a10ccf2090841328" +checksum = "07c8482ae4aac6bb7d73aef79df5fb403a16a0cfbe200442532cff6b98613383" dependencies = [ "cbindgen", "num-derive 0.2.5", "num-traits", "remove_dir_all", - "solana-sdk 1.2.13", + "solana-sdk 1.2.17", "thiserror", ] diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml index 3042bae736..31dde4dad5 100644 --- a/account-decoder/Cargo.toml +++ b/account-decoder/Cargo.toml @@ -15,7 +15,7 @@ Inflector = "0.11.4" lazy_static = "1.4.0" solana-sdk = { path = "../sdk", version = "1.2.18" } solana-vote-program = { path = "../programs/vote", version = "1.2.18" } -spl-token-v1-0 = { package = "spl-token", version = "1.0.3", features = ["skip-no-mangle"] } +spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } serde = "1.0.112" serde_derive = "1.0.103" serde_json = "1.0.54" diff --git a/account-decoder/src/parse_token.rs b/account-decoder/src/parse_token.rs index 5b4a777115..358548e210 100644 --- a/account-decoder/src/parse_token.rs +++ b/account-decoder/src/parse_token.rs @@ -3,7 +3,7 @@ use solana_sdk::pubkey::Pubkey; use spl_token_v1_0::{ option::COption, solana_sdk::pubkey::Pubkey as SplTokenPubkey, - state::{Account, Mint, Multisig, State}, + state::{unpack, Account, Mint, Multisig}, }; use std::{mem::size_of, str::FromStr}; @@ -15,7 +15,7 @@ pub fn spl_token_id_v1_0() -> Pubkey { pub fn parse_token(data: &[u8]) -> Result { let mut data = data.to_vec(); if data.len() == size_of::() { - let account: Account = *State::unpack(&mut data) + let account: Account = *unpack(&mut data) .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?; Ok(TokenAccountType::Account(UiTokenAccount { mint: account.mint.to_string(), @@ -30,7 +30,7 @@ pub fn parse_token(data: &[u8]) -> Result { delegated_amount: account.delegated_amount, })) } else if data.len() == size_of::() { - let mint: Mint = *State::unpack(&mut data) + let mint: Mint = *unpack(&mut data) .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?; Ok(TokenAccountType::Mint(UiMint { owner: match mint.owner { @@ -41,7 +41,7 @@ pub fn parse_token(data: &[u8]) -> Result { is_initialized: mint.is_initialized, })) } else if data.len() == size_of::() { - let multisig: Multisig = *State::unpack(&mut data) + let multisig: Multisig = *unpack(&mut data) .map_err(|_| ParseAccountError::AccountNotParsable(ParsableAccount::SplToken))?; Ok(TokenAccountType::Multisig(UiMultisig { num_required_signers: multisig.m, @@ -106,13 +106,14 @@ pub struct UiMultisig { #[cfg(test)] mod test { use super::*; + use spl_token_v1_0::state::unpack_unchecked; #[test] fn test_parse_token() { let mint_pubkey = SplTokenPubkey::new(&[2; 32]); let owner_pubkey = SplTokenPubkey::new(&[3; 32]); let mut account_data = [0; size_of::()]; - let mut account: &mut Account = State::unpack_unchecked(&mut account_data).unwrap(); + let mut account: &mut Account = unpack_unchecked(&mut account_data).unwrap(); account.mint = mint_pubkey; account.owner = owner_pubkey; account.amount = 42; @@ -131,7 +132,7 @@ mod test { ); let mut mint_data = [0; size_of::()]; - let mut mint: &mut Mint = State::unpack_unchecked(&mut mint_data).unwrap(); + let mut mint: &mut Mint = unpack_unchecked(&mut mint_data).unwrap(); mint.owner = COption::Some(owner_pubkey); mint.decimals = 3; mint.is_initialized = true; @@ -148,7 +149,7 @@ mod test { let signer2 = SplTokenPubkey::new(&[2; 32]); let signer3 = SplTokenPubkey::new(&[3; 32]); let mut multisig_data = [0; size_of::()]; - let mut multisig: &mut Multisig = State::unpack_unchecked(&mut multisig_data).unwrap(); + let mut multisig: &mut Multisig = unpack_unchecked(&mut multisig_data).unwrap(); let mut signers = [SplTokenPubkey::default(); 11]; signers[0] = signer1; signers[1] = signer2; diff --git a/core/Cargo.toml b/core/Cargo.toml index 3cae27fff9..17177d3caf 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -65,7 +65,7 @@ solana-transaction-status = { path = "../transaction-status", version = "1.2.18" solana-version = { path = "../version", version = "1.2.18" } solana-vote-program = { path = "../programs/vote", version = "1.2.18" } solana-vote-signer = { path = "../vote-signer", version = "1.2.18" } -spl-token-v1-0 = { package = "spl-token", version = "1.0.3", features = ["skip-no-mangle"] } +spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } tempfile = "3.1.0" thiserror = "1.0" tokio = "0.1" diff --git a/core/src/rpc.rs b/core/src/rpc.rs index 7d555d3d5c..cbb8ff59f9 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -51,7 +51,7 @@ use solana_transaction_status::{ ConfirmedBlock, ConfirmedTransaction, TransactionStatus, UiTransactionEncoding, }; use solana_vote_program::vote_state::{VoteState, MAX_LOCKOUT_HISTORY}; -use spl_token_v1_0::state::{Account as TokenAccount, State as TokenState}; +use spl_token_v1_0::state::Account as TokenAccount; use std::{ cmp::{max, min}, collections::{HashMap, HashSet}, @@ -800,7 +800,7 @@ impl JsonRpcRequestProcessor { )); } let mut data = account.data.to_vec(); - let balance = TokenState::unpack(&mut data) + let balance = spl_token_v1_0::state::unpack(&mut data) .map_err(|_| { Error::invalid_params("Invalid param: not a v1.0 Token account".to_string()) }) @@ -835,7 +835,7 @@ impl JsonRpcRequestProcessor { let supply = get_filtered_program_accounts(&bank, &mint_account.owner, filters) .map(|(_pubkey, account)| { let mut data = account.data.to_vec(); - TokenState::unpack(&mut data) + spl_token_v1_0::state::unpack(&mut data) .map(|account: &mut TokenAccount| account.amount) .unwrap_or(0) }) @@ -4181,7 +4181,8 @@ pub mod tests { let RpcHandler { io, meta, bank, .. } = start_rpc_handler_with_tx(&Pubkey::new_rand()); let mut account_data = [0; size_of::()]; - let account: &mut TokenAccount = TokenState::unpack_unchecked(&mut account_data).unwrap(); + let account: &mut TokenAccount = + spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap(); let mint = SplTokenPubkey::new(&[2; 32]); let owner = SplTokenPubkey::new(&[3; 32]); let delegate = SplTokenPubkey::new(&[4; 32]); @@ -4225,7 +4226,8 @@ pub mod tests { // Add the mint, plus another token account to ensure getTokenSupply sums all mint accounts let mut mint_data = [0; size_of::()]; - let mint_state: &mut Mint = TokenState::unpack_unchecked(&mut mint_data).unwrap(); + let mint_state: &mut Mint = + spl_token_v1_0::state::unpack_unchecked(&mut mint_data).unwrap(); *mint_state = Mint { owner: COption::Some(owner), decimals: 2, @@ -4263,7 +4265,8 @@ pub mod tests { // Add another token account with the same owner and delegate but different mint let mut account_data = [0; size_of::()]; - let account: &mut TokenAccount = TokenState::unpack_unchecked(&mut account_data).unwrap(); + let account: &mut TokenAccount = + spl_token_v1_0::state::unpack_unchecked(&mut account_data).unwrap(); let new_mint = SplTokenPubkey::new(&[5; 32]); *account = TokenAccount { mint: new_mint, diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml index 41997f77d7..56840bfc95 100644 --- a/transaction-status/Cargo.toml +++ b/transaction-status/Cargo.toml @@ -15,8 +15,8 @@ Inflector = "0.11.4" lazy_static = "1.4.0" solana-account-decoder = { path = "../account-decoder", version = "1.2.18" } solana-sdk = { path = "../sdk", version = "1.2.18" } -spl-memo-v1-0 = { package = "spl-memo", version = "1.0.4", features = ["skip-no-mangle"] } -spl-token-v1-0 = { package = "spl-token", version = "1.0.3", features = ["skip-no-mangle"] } +spl-memo-v1-0 = { package = "spl-memo", version = "1.0.7", features = ["skip-no-mangle"] } +spl-token-v1-0 = { package = "spl-token", version = "1.0.6", features = ["skip-no-mangle"] } serde = "1.0.110" serde_derive = "1.0.103" serde_json = "1.0.54"