From 9a8fa8e8452bddef65e1250cdbf953ecfa75f6ff Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Mon, 19 Oct 2020 18:07:45 +0800 Subject: [PATCH] Update SDK version to v1.3.17 (#649) * Update SDK version to v1.3.17 * Fix clients --- Cargo.lock | 2 +- bpf-sdk-install.sh | 2 +- shared-memory/client/Cargo.lock | 103 ++++++++---------- shared-memory/client/Cargo.toml | 8 +- shared-memory/client/tests/shared-memory.rs | 11 +- shared-memory/program/Cargo.toml | 2 +- themis/program_bn/Cargo.toml | 2 +- token-lending/program/Cargo.toml | 2 +- token-swap/js/package.json | 2 +- token-swap/program/Cargo.toml | 2 +- token/js/package.json | 2 +- token/perf-monitor/Cargo.lock | 88 ++++++++------- token/perf-monitor/Cargo.toml | 6 +- .../tests/assert_instruction_count.rs | 11 +- token/program-v3/Cargo.toml | 2 +- 15 files changed, 126 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57a96ee5..3f97072b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2796,7 +2796,7 @@ dependencies = [ "remove_dir_all", "serde", "serde_derive", - "solana-sdk 1.3.17", + "solana-sdk", "spl-token 2.0.8", "thiserror", ] diff --git a/bpf-sdk-install.sh b/bpf-sdk-install.sh index c7f22b75..37493d5b 100755 --- a/bpf-sdk-install.sh +++ b/bpf-sdk-install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -channel=${1:-v1.3.14} +channel=${1:-v1.3.17} installDir="$(dirname "$0")"/bin cacheDir=~/.cache/solana-bpf-sdk/"$channel" diff --git a/shared-memory/client/Cargo.lock b/shared-memory/client/Cargo.lock index 1c3db9c1..26564188 100644 --- a/shared-memory/client/Cargo.lock +++ b/shared-memory/client/Cargo.lock @@ -383,6 +383,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core", + "subtle 2.2.3", + "zeroize", +] + [[package]] name = "digest" version = "0.8.1" @@ -432,7 +445,7 @@ version = "1.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a8a37f4e8b35af971e6db5e3897e7a6344caa3f92f6544f88125a1f5f0035a" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 2.1.0", "ed25519", "rand", "serde", @@ -468,28 +481,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2 1.0.19", - "quote 1.0.6", - "syn 1.0.39", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1722,12 +1713,13 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450c86bce41818155645d5c570bb9e860bc862f3d8241ad268311e4ee21c5b13" +checksum = "f4e65edb39170c8cba00256a2ae041c28bbc97cf4add0173543ab0a9893fc91b" dependencies = [ "bincode", "byteorder", + "curve25519-dalek 3.0.0", "num-derive", "num-traits", "solana-runtime", @@ -1738,9 +1730,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5fe6f27c71ff3248b8663b94bb1fe3c8560c8a14a3a33544dc447bdd662407" +checksum = "49d31450d593803698c8df43ba5cd861decfab9ea057899f8e19f50df105c306" dependencies = [ "bincode", "chrono", @@ -1752,17 +1744,16 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.3.16" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9848c879de7085c6e297fb14f5ce3cfd64774f04513ac1c935c73bff26b45f3d" +checksum = "d665c51b3065feb33f641dd1b29d476e11e14dac657725a8ba9af52e68b6618d" dependencies = [ "backtrace", "bytes 0.4.12", "cc", - "curve25519-dalek", + "curve25519-dalek 2.1.0", "ed25519-dalek", "either", - "failure", "lazy_static", "libc", "rand_chacha", @@ -1777,9 +1768,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.3.16" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583f4a0b43415aa072f0137375cbd2400a0b3b52e32e3ae15ddfe0b2ef7d1b56" +checksum = "aa91a8812e60bcfdaffaf0d7202a6fb55b64e19a144c313d208829634c69544c" dependencies = [ "env_logger", "lazy_static", @@ -1788,9 +1779,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e671f9a95cac920ada447b6852bd7e72e0635a1d3dc3bdd7a28668cdc5533" +checksum = "8d31aaf307e4bcc52b18d1fe8971bdede0a0ee0e0242ea322ae5bc2e71bb5883" dependencies = [ "jemalloc-ctl", "jemallocator", @@ -1801,9 +1792,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421614c84626f5ca2bc21760f8cc77df548791766e35c78e210218e616b92c37" +checksum = "5fd1e167af8decba13acdc487cfb26ffa976e1b2fb7507baa800e9b0ae086729" dependencies = [ "env_logger", "gethostname", @@ -1815,9 +1806,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.3.16" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3b9f58a0c898390b4c2f80c480f8a3085ff1f14fe5219fa600217bdf60e407" +checksum = "cfb5a22cee0ded53e11090c6bcd963eff6d43caf49c4cda42691e94fab7ddd7d" dependencies = [ "lazy_static", "num_cpus", @@ -1825,9 +1816,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e80c2a751acc9a56c22852cccab6e9334873691f119296cb0fe6bbfae7c46" +checksum = "d511d1dfcf89db6783e83f9f028f139bbff357e190bd0947bd23ff1235f97558" dependencies = [ "bincode", "blake3", @@ -1873,9 +1864,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa41a7f3655cb6336562e6c194d7ce5253ebbf21894bf3ef524e5f4e1b1d5e6a" +checksum = "6e8742ccdaac9ff6e7085e8eb3737858254e4691c6fcaac6b472875db2bbba0d" dependencies = [ "assert_matches", "bincode", @@ -1883,7 +1874,7 @@ dependencies = [ "bv", "byteorder", "chrono", - "curve25519-dalek", + "curve25519-dalek 2.1.0", "digest 0.9.0", "ed25519-dalek", "generic-array 0.14.4", @@ -1915,9 +1906,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.3.16" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be46b64096cca179e884c8f5585421f8e56d543a11abf075acdedb32f797ec80" +checksum = "4f38f6c5f3b4119ffa7f75156836e5c88082e557fa978fe1f87995bd386b0d08" dependencies = [ "bs58", "proc-macro2 1.0.19", @@ -1928,9 +1919,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro-frozen-abi" -version = "1.3.16" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9849052278a4d2102ac318004508871c6e64e64f812c1a83836d5ae575c3b06" +checksum = "8e47f618ad2d7af7b9c701e9cc9951681f6d6a9c754863f2ab63e1b98507e515" dependencies = [ "lazy_static", "proc-macro2 1.0.19", @@ -1941,9 +1932,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5acdcfef86bd2b61839dde6992d12ac1b2765a2a45d050aad38e3f362af7c88" +checksum = "5d8888a924c9183f430a72e1a643648aeff105278bc39315d211bd6b6197e0a0" dependencies = [ "bincode", "digest 0.9.0", @@ -1956,9 +1947,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a1b7383fc4758e7d9b63c6d12e5a6d596ecbfc5330805db7533b7e1fa6843" +checksum = "b3780a14335d07b301128ad518876c8f4c3cb513f88e808faef3ed8a5090abc6" dependencies = [ "bincode", "log", @@ -1977,9 +1968,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31111ce08a479196243bf5335a173f899960ec5fdc0d937fe3bd42289dfbb656" +checksum = "595274785736cbae1f012ed1c78aebbbe2cf75720dec1e1850800c9cd64fae9b" dependencies = [ "bincode", "log", @@ -1997,9 +1988,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962f8f04ac7239fe4dd45fa4ce706ec78b59a0da9f41def463832857e36c60b0" +checksum = "9a95dbe2b00920ac4e1524b7442cf5319f01e8fa5742930ac60148882fd7738b" dependencies = [ "byteorder", "combine", diff --git a/shared-memory/client/Cargo.toml b/shared-memory/client/Cargo.toml index 6e696fb4..ce011bb8 100644 --- a/shared-memory/client/Cargo.toml +++ b/shared-memory/client/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" [dev-dependencies] rand = { version = "0.7.0"} spl-shared-memory = { path = "../program" } -solana-bpf-loader-program = { version = "1.3.14" } -solana_rbpf = "=0.1.31" -solana-runtime = { version = "1.3.14" } -solana-sdk = { version = "1.3.14" } +solana-bpf-loader-program = { version = "1.3.17" } +solana_rbpf = "=0.1.32" +solana-runtime = { version = "1.3.17" } +solana-sdk = { version = "1.3.17" } diff --git a/shared-memory/client/tests/shared-memory.rs b/shared-memory/client/tests/shared-memory.rs index 95272329..6d4b63b2 100644 --- a/shared-memory/client/tests/shared-memory.rs +++ b/shared-memory/client/tests/shared-memory.rs @@ -196,6 +196,7 @@ fn test_share_data() { struct MockInvokeContext { pub key: Pubkey, pub logger: MockLogger, + pub compute_budget: ComputeBudget, pub compute_meter: MockComputeMeter, } impl InvokeContext for MockInvokeContext { @@ -220,11 +221,8 @@ impl InvokeContext for MockInvokeContext { fn get_logger(&self) -> Rc> { Rc::new(RefCell::new(self.logger.clone())) } - fn is_cross_program_supported(&self) -> bool { - true - } - fn get_compute_budget(&self) -> ComputeBudget { - ComputeBudget::default() + fn get_compute_budget(&self) -> &ComputeBudget { + &self.compute_budget } fn get_compute_meter(&self) -> Rc> { Rc::new(RefCell::new(self.compute_meter.clone())) @@ -234,6 +232,9 @@ impl InvokeContext for MockInvokeContext { None } fn record_instruction(&self, _instruction: &Instruction) {} + fn is_feature_active(&self, _feature_id: &Pubkey) -> bool { + true + } } #[derive(Debug, Default, Clone)] diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml index 645c5ed8..e36ed22e 100644 --- a/shared-memory/program/Cargo.toml +++ b/shared-memory/program/Cargo.toml @@ -17,7 +17,7 @@ default = ["solana-sdk/default"] [dependencies] arrayref = "0.3.6" -solana-sdk = { version = "1.3.14", default-features = false, optional = true } +solana-sdk = { version = "1.3.17", default-features = false, optional = true } [lib] crate-type = ["cdylib", "lib"] diff --git a/themis/program_bn/Cargo.toml b/themis/program_bn/Cargo.toml index 2787941e..6949368d 100644 --- a/themis/program_bn/Cargo.toml +++ b/themis/program_bn/Cargo.toml @@ -25,7 +25,7 @@ getrandom = { version = "0.1.15", features = ["dummy"] } num-derive = "0.3" num-traits = "0.2" rand = "0.7.0" -solana-sdk = { version = "1.3.14", default-features = false, optional = true } +solana-sdk = { version = "1.3.17", default-features = false, optional = true } thiserror = "1.0" [lib] diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml index 6fcc6a78..3d16b9a7 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -20,7 +20,7 @@ arrayref = "0.3.6" num_enum = "0.5.1" num-derive = "0.3" num-traits = "0.2" -solana-sdk = { version = "1.3.14", default-features = false } +solana-sdk = { version = "1.3.17", default-features = false } thiserror = "1.0" [dev-dependencies] diff --git a/token-swap/js/package.json b/token-swap/js/package.json index 997107e8..f751cf88 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -22,7 +22,7 @@ "/lib", "/module.flow.js" ], - "testnetDefaultChannel": "v1.3.13", + "testnetDefaultChannel": "v1.3.17", "scripts": { "build": "rollup -c", "start": "babel-node --ignore node_modules cli/main.js", diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index 5ec0af24..e087693f 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -21,7 +21,7 @@ arrayref = "0.3.6" num-derive = "0.3" num-traits = "0.2" remove_dir_all = "=0.5.0" -solana-sdk = { version = "1.3.14", default-features = false, optional = true } +solana-sdk = { version = "1.3.17", default-features = false, optional = true } spl-token = { path = "../../token/program", default-features = false, optional = true } thiserror = "1.0" diff --git a/token/js/package.json b/token/js/package.json index 261c795a..0f242ea9 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -22,7 +22,7 @@ "/lib", "/module.flow.js" ], - "testnetDefaultChannel": "v1.3.14", + "testnetDefaultChannel": "v1.3.17", "scripts": { "build": "rollup -c", "start": "babel-node cli/main.js", diff --git a/token/perf-monitor/Cargo.lock b/token/perf-monitor/Cargo.lock index 30156989..e5c4fd3f 100644 --- a/token/perf-monitor/Cargo.lock +++ b/token/perf-monitor/Cargo.lock @@ -383,6 +383,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core", + "subtle 2.2.3", + "zeroize", +] + [[package]] name = "derivative" version = "2.1.1" @@ -443,7 +456,7 @@ version = "1.0.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a8a37f4e8b35af971e6db5e3897e7a6344caa3f92f6544f88125a1f5f0035a" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 2.1.0", "ed25519", "rand", "serde", @@ -1412,9 +1425,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270" +checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" dependencies = [ "autocfg", "crossbeam-deque", @@ -1424,9 +1437,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91739a34c4355b5434ce54c9086c5895604a9c278586d1f1aa95e04f66b525a0" +checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1742,12 +1755,13 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450c86bce41818155645d5c570bb9e860bc862f3d8241ad268311e4ee21c5b13" +checksum = "f4e65edb39170c8cba00256a2ae041c28bbc97cf4add0173543ab0a9893fc91b" dependencies = [ "bincode", "byteorder", + "curve25519-dalek 3.0.0", "num-derive", "num-traits", "solana-runtime", @@ -1758,9 +1772,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5fe6f27c71ff3248b8663b94bb1fe3c8560c8a14a3a33544dc447bdd662407" +checksum = "49d31450d593803698c8df43ba5cd861decfab9ea057899f8e19f50df105c306" dependencies = [ "bincode", "chrono", @@ -1772,14 +1786,14 @@ dependencies = [ [[package]] name = "solana-crate-features" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866166a515ce4b40ded42ae44ef238cc03226cf04a423ab8f54700fd30fd664a" +checksum = "d665c51b3065feb33f641dd1b29d476e11e14dac657725a8ba9af52e68b6618d" dependencies = [ "backtrace", "bytes 0.4.12", "cc", - "curve25519-dalek", + "curve25519-dalek 2.1.0", "ed25519-dalek", "either", "lazy_static", @@ -1796,9 +1810,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef9c050b4d502d67d026f2e08a2f87a1c6bd98ed71a22db81f9846739a4fd2" +checksum = "aa91a8812e60bcfdaffaf0d7202a6fb55b64e19a144c313d208829634c69544c" dependencies = [ "env_logger", "lazy_static", @@ -1807,9 +1821,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e671f9a95cac920ada447b6852bd7e72e0635a1d3dc3bdd7a28668cdc5533" +checksum = "8d31aaf307e4bcc52b18d1fe8971bdede0a0ee0e0242ea322ae5bc2e71bb5883" dependencies = [ "jemalloc-ctl", "jemallocator", @@ -1820,9 +1834,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421614c84626f5ca2bc21760f8cc77df548791766e35c78e210218e616b92c37" +checksum = "5fd1e167af8decba13acdc487cfb26ffa976e1b2fb7507baa800e9b0ae086729" dependencies = [ "env_logger", "gethostname", @@ -1834,9 +1848,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d02f25437a66002b1ce694143705d79cf79aa46cdda1f8decd12a3de2c90e386" +checksum = "cfb5a22cee0ded53e11090c6bcd963eff6d43caf49c4cda42691e94fab7ddd7d" dependencies = [ "lazy_static", "num_cpus", @@ -1844,9 +1858,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e80c2a751acc9a56c22852cccab6e9334873691f119296cb0fe6bbfae7c46" +checksum = "d511d1dfcf89db6783e83f9f028f139bbff357e190bd0947bd23ff1235f97558" dependencies = [ "bincode", "blake3", @@ -1892,9 +1906,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.3.17" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44da1f0f98587a8ef6eca0bce99a5837b1cba1ed371005e19d6b21b335e2d05" +checksum = "6e8742ccdaac9ff6e7085e8eb3737858254e4691c6fcaac6b472875db2bbba0d" dependencies = [ "assert_matches", "bincode", @@ -1902,7 +1916,7 @@ dependencies = [ "bv", "byteorder", "chrono", - "curve25519-dalek", + "curve25519-dalek 2.1.0", "digest 0.9.0", "ed25519-dalek", "generic-array 0.14.4", @@ -1934,9 +1948,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77033e18acf3e9e580e25a999a45279f73dc2e8440250b2a7959f74c8ee94a4a" +checksum = "4f38f6c5f3b4119ffa7f75156836e5c88082e557fa978fe1f87995bd386b0d08" dependencies = [ "bs58", "proc-macro2 1.0.19", @@ -1947,9 +1961,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro-frozen-abi" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef03519deb55e8cb33aa7be941a13e59de0e437f3a5ce9118c71d96556e5293f" +checksum = "8e47f618ad2d7af7b9c701e9cc9951681f6d6a9c754863f2ab63e1b98507e515" dependencies = [ "lazy_static", "proc-macro2 1.0.19", @@ -1960,9 +1974,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5acdcfef86bd2b61839dde6992d12ac1b2765a2a45d050aad38e3f362af7c88" +checksum = "5d8888a924c9183f430a72e1a643648aeff105278bc39315d211bd6b6197e0a0" dependencies = [ "bincode", "digest 0.9.0", @@ -1975,9 +1989,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a1b7383fc4758e7d9b63c6d12e5a6d596ecbfc5330805db7533b7e1fa6843" +checksum = "b3780a14335d07b301128ad518876c8f4c3cb513f88e808faef3ed8a5090abc6" dependencies = [ "bincode", "log", @@ -1996,9 +2010,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.3.14" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31111ce08a479196243bf5335a173f899960ec5fdc0d937fe3bd42289dfbb656" +checksum = "595274785736cbae1f012ed1c78aebbbe2cf75720dec1e1850800c9cd64fae9b" dependencies = [ "bincode", "log", @@ -2016,9 +2030,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962f8f04ac7239fe4dd45fa4ce706ec78b59a0da9f41def463832857e36c60b0" +checksum = "9a95dbe2b00920ac4e1524b7442cf5319f01e8fa5742930ac60148882fd7738b" dependencies = [ "byteorder", "combine", diff --git a/token/perf-monitor/Cargo.toml b/token/perf-monitor/Cargo.toml index 86414331..327d53f7 100644 --- a/token/perf-monitor/Cargo.toml +++ b/token/perf-monitor/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [dev-dependencies] rand = { version = "0.7.0"} spl-token = { path = "../program" } -solana-runtime = { version = "1.3.14" } +solana-runtime = { version = "1.3.17" } solana-sdk = { version = "1.3.17" } -solana-bpf-loader-program = { version = "1.3.14" } -solana_rbpf = "=0.1.31" +solana-bpf-loader-program = { version = "1.3.17" } +solana_rbpf = "=0.1.32" diff --git a/token/perf-monitor/tests/assert_instruction_count.rs b/token/perf-monitor/tests/assert_instruction_count.rs index 1c187747..02c9924f 100644 --- a/token/perf-monitor/tests/assert_instruction_count.rs +++ b/token/perf-monitor/tests/assert_instruction_count.rs @@ -177,6 +177,7 @@ fn assert_instruction_count() { struct MockInvokeContext { pub key: Pubkey, pub logger: MockLogger, + pub compute_budget: ComputeBudget, pub compute_meter: MockComputeMeter, } impl InvokeContext for MockInvokeContext { @@ -201,11 +202,8 @@ impl InvokeContext for MockInvokeContext { fn get_logger(&self) -> Rc> { Rc::new(RefCell::new(self.logger.clone())) } - fn is_cross_program_supported(&self) -> bool { - true - } - fn get_compute_budget(&self) -> ComputeBudget { - ComputeBudget::default() + fn get_compute_budget(&self) -> &ComputeBudget { + &self.compute_budget } fn get_compute_meter(&self) -> Rc> { Rc::new(RefCell::new(self.compute_meter.clone())) @@ -215,6 +213,9 @@ impl InvokeContext for MockInvokeContext { None } fn record_instruction(&self, _instruction: &Instruction) {} + fn is_feature_active(&self, _feature_id: &Pubkey) -> bool { + true + } } #[derive(Debug, Default, Clone)] diff --git a/token/program-v3/Cargo.toml b/token/program-v3/Cargo.toml index 40112fe1..db3456f1 100644 --- a/token/program-v3/Cargo.toml +++ b/token/program-v3/Cargo.toml @@ -20,7 +20,7 @@ default = ["solana-sdk/default"] num-derive = "0.3" num-traits = "0.2" remove_dir_all = "=0.5.0" -solana-sdk = { version = "1.3.14", default-features = false, optional = true } +solana-sdk = { version = "1.3.17", default-features = false, optional = true } thiserror = "1.0" arrayref = "0.3.6" num_enum = "0.5.1"