From 373b5c96eef08cefcff6da5d05d8c6fdcb0dd21c Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 17 Mar 2021 00:52:00 -0700 Subject: [PATCH] Update to Solana 1.5.15 (#158) --- .travis.yml | 2 +- src/program-rust/Cargo.lock | 82 +++++++++++++++++------------------ src/program-rust/Cargo.toml | 7 ++- src/program-rust/tests/lib.rs | 2 +- 4 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee09bc78..a2341ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ install: - nvm install node - node --version - npm install - - sh -c "$(curl -sSfL https://release.solana.com/v1.5.8/install)" + - sh -c "$(curl -sSfL https://release.solana.com/v1.5.15/install)" - export PATH=~/.local/share/solana/install/active_release/bin:$PATH - solana-install info diff --git a/src/program-rust/Cargo.lock b/src/program-rust/Cargo.lock index 87a52144..25c04e96 100644 --- a/src/program-rust/Cargo.lock +++ b/src/program-rust/Cargo.lock @@ -2188,9 +2188,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cecfcb538a11ff7673f0cb2a4d552339ae4a5474f167d75a9d4988653795890" +checksum = "b344eb235ff9ff29a8bb8785b7eb30ce0458e98b69785171ce941111313829e7" dependencies = [ "bincode", "borsh", @@ -2207,9 +2207,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3fee8b4dce68968038d367466e4e7da1b67de3353b18c9baefcfed98d43713" +checksum = "106c196d9911294b0be46ed49b089ddab342d33d26e4ce13219df9dd582f6122" dependencies = [ "mio 0.7.9", "serde", @@ -2219,9 +2219,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5eb7f7b5fe99dc3dce7655de8fe1a76bb5eaed4f0d90d81cfcb404e29a91219" +checksum = "5270cb80e5156830ee05a4bcf423f75035f2aa636fb664176b03e3a0aacad006" dependencies = [ "bincode", "futures 0.3.13", @@ -2244,18 +2244,18 @@ dependencies = [ "solana-program", "solana-program-test", "solana-sdk", - "tokio 0.3.7", ] [[package]] name = "solana-bpf-loader-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9718cac7c73e4c3a9e8f29322efeb81c217886dc7f2303c00b0e2b1f94ef25b5" +checksum = "f6e22a2688bdca354dadd26f0e016941a4c6470465f4e21a0141fd0e79f8aa4d" dependencies = [ "bincode", "byteorder", "curve25519-dalek 3.0.2", + "log", "num-derive", "num-traits", "rand_core 0.6.2", @@ -2267,9 +2267,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5498102950c1f21ee990b49a02f314d5e7c39b486dd037cea07ab3215b85aded" +checksum = "d0742db5b1ba5cff328180b9640e974d5be685a6e124cb076e93a2dbb37920bb" dependencies = [ "bincode", "chrono", @@ -2282,9 +2282,9 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "482146f96dfb27aa2d47c9bafe396befa6fbbc380a00992b279900e46c3d6bd3" +checksum = "99fc7598a8cd6c06ef61ff26fd21040cf66e165a9a87815112ee29a11d49fbbe" dependencies = [ "backtrace", "bytes 0.4.12", @@ -2306,9 +2306,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9422b85d5a3c745fc295ce2b7fcf750b471ff7df024054364e9f1943c291579f" +checksum = "5bfc5fc18839f3f246918605fe7c73fcb77f38f409c1b5bd94ac2bc7dbed8af1" dependencies = [ "bs58", "bv", @@ -2326,9 +2326,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd067e75733685ce7de6a320cdf6413734d5b7f87d26979d3d55c296e56ca20" +checksum = "ad15b641518fd06ec7c7340bc7084452a3df41db010e7336daacc71982419286" dependencies = [ "lazy_static", "proc-macro2 1.0.24", @@ -2339,9 +2339,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df776ad38b50574ad98a016afa6318200c480ddbd82cfeb162af30a2e4ff43ac" +checksum = "a43574788d590dd391adb95dd4e5c77d6b7a34643f87ce3def53c88609411f82" dependencies = [ "env_logger", "lazy_static", @@ -2350,9 +2350,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9eebdb42760977cc566c7c75f6f40a2780e6f7412c93338ebad75e8c7e80fd7" +checksum = "73d08db83bc404770b2c71683a8ac82362191adf93a43f7b477d8790e9813bac" dependencies = [ "jemalloc-ctl", "jemallocator", @@ -2363,9 +2363,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe99297d2271d9adac222d971abfe3cef599bff736bcf942868dd6044aab8e1" +checksum = "f75e71e51ad934f7c009b9f91bf38ba2c4fdcc5067309143a44ca8a9132e4cc5" dependencies = [ "env_logger", "gethostname", @@ -2377,9 +2377,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b400512c2dae0c5773087f31ceb038e73cbea159902d2f3a613844aa6312f7dc" +checksum = "0611108a184bb2b8dd99915ced4aa0066a9aecaabba634608a95ff869a2fd5f6" dependencies = [ "bincode", "borsh", @@ -2409,9 +2409,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935b1ce1f4bad8b9eb7c9d748f42acf625044f75c46032133ddaff31c7de4d4d" +checksum = "07e523bcad07ca3c3b495d2f73c9b8ca8edbdd0e3ad96a9232e6131e3cdf0e7d" dependencies = [ "async-trait", "base64 0.12.3", @@ -2433,9 +2433,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187fe2696341fe088908a5de485a20196c6b1dd3f793212f952efa295bf4bd56" +checksum = "34d41402ff03aa6eb1bb16ee264f6f630cdd4cdbe788c1445a2ce5d56029892c" dependencies = [ "lazy_static", "num_cpus", @@ -2443,9 +2443,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632b5ef79468ca00ad223106ee92329135a4fe3e61f948d3cf2106eaf48ba43" +checksum = "f42076f62f0680ca4f8ab54e9a09183cb2f2f08b3e97fef1f271077dc2cdae37" dependencies = [ "bincode", "blake3", @@ -2494,9 +2494,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400e8646d1a17e8b62affceead9f014c020bb98d67537cb4941ca31d8cf042b7" +checksum = "a13a1da30516b20542a09d56880173e2dc10913014273064ee0a2cbff2663097" dependencies = [ "assert_matches", "bincode", @@ -2538,9 +2538,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd6ba0756969873d7ea48b9172f6d51a4cb462337cfbdab16d04ac77020bfc0" +checksum = "a26120921bf5b5956cc8d557c2b43328824c83d530dd30f0eb6fe9bff8480b0b" dependencies = [ "bs58", "proc-macro2 1.0.24", @@ -2551,9 +2551,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1149fcf548c613270bf7e30782da458c7d9881ac4d9bb77797f69c1dd46c8b44" +checksum = "be88a66e79697851f23ccec6f6b58363735f65a214159eee0f1c9ad692155592" dependencies = [ "bincode", "digest 0.9.0", @@ -2566,9 +2566,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c42d3aeeed82af9e43e1ac03468af0e64394017a82f05102dcceb26e8fd1b" +checksum = "a75dfb5494f40481a6c2e5becb8f5ed24040ef7b8181ff7ab6b7ba147b2b5890" dependencies = [ "bincode", "log", @@ -2588,9 +2588,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.5.11" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20342656be3909158010bb24745f4144adcc65b7f2be7ad631b85c04f09a620f" +checksum = "799a77972988927f5ec7e7108b508d9b89859a0e71baeac57941168102d1869d" dependencies = [ "bincode", "log", diff --git a/src/program-rust/Cargo.toml b/src/program-rust/Cargo.toml index 42e6a8bd..5894547a 100644 --- a/src/program-rust/Cargo.toml +++ b/src/program-rust/Cargo.toml @@ -14,12 +14,11 @@ no-entrypoint = [] [dependencies] byteorder = "1.3" -solana-program = "=1.5.11" +solana-program = "=1.5.15" [dev-dependencies] -solana-program-test = "=1.5.11" -solana-sdk = "=1.5.11" -tokio = { version = "0.3.5", features = ["full"] } +solana-program-test = "=1.5.15" +solana-sdk = "=1.5.15" [lib] crate-type = ["cdylib", "lib"] diff --git a/src/program-rust/tests/lib.rs b/src/program-rust/tests/lib.rs index ccedc6d7..bab69ac4 100644 --- a/src/program-rust/tests/lib.rs +++ b/src/program-rust/tests/lib.rs @@ -1,5 +1,5 @@ use byteorder::{ByteOrder, LittleEndian}; -use solana_program_test::ProgramTest; +use solana_program_test::*; use solana_sdk::{ account::Account, instruction::{AccountMeta, Instruction},