From 40ea715bebbdaf32d9430f28ad186f626e35b94c Mon Sep 17 00:00:00 2001 From: Kirill Fomichev Date: Sun, 27 Mar 2022 03:28:55 +0300 Subject: [PATCH] lang, cli, spl: Update solana toolchain to v1.9.13 (#1653) Co-authored-by: Paul Schaaf --- .github/workflows/tests.yaml | 52 +- CHANGELOG.md | 1 + Cargo.lock | 880 +++++++----------- cli/Cargo.toml | 10 +- cli/src/lib.rs | 24 +- client/src/lib.rs | 4 +- docker/Makefile | 2 +- lang/Cargo.toml | 2 +- lang/src/lib.rs | 2 - spl/Cargo.toml | 2 +- tests/auction-house | 2 +- tests/misc/Anchor.toml | 2 +- tests/misc/ci.sh | 11 + tests/misc/miscNonRentExempt.ts | 135 +++ tests/misc/programs/misc/src/lib.rs | 2 +- tests/misc/tests/misc.ts | 130 +-- .../zero-copy/tests/compute_unit_test.rs | 2 +- 17 files changed, 584 insertions(+), 679 deletions(-) create mode 100755 tests/misc/ci.sh create mode 100644 tests/misc/miscNonRentExempt.ts diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 29e37606..5dab9324 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -8,7 +8,7 @@ on: branches: - master env: - SOLANA_CLI_VERSION: 1.8.14 + SOLANA_CLI_VERSION: 1.9.13 NODE_VERSION: 17.0.1 jobs: @@ -239,6 +239,56 @@ jobs: - run: cd tests/bpf-upgradeable-state && cp bpf_upgradeable_state-keypair.json target/deploy/bpf_upgradeable_state-keypair.json && anchor test --skip-local-validator --skip-build --skip-lint - uses: ./.github/actions/git-diff/ + # this test exists to make sure that anchor + # checks rent correctly for legacy accounts + # that don't have to be rent-exempt + test-misc-non-rent-exempt: + # the anchor cli is built with a different solana version + # but that's fine since it's just the cli + needs: setup-anchor-cli + name: Test tests/misc/nonRentExempt + runs-on: ubuntu-18.04 + timeout-minutes: 30 + steps: + - uses: actions/checkout@v2 + - uses: ./.github/actions/setup/ + - uses: ./.github/actions/setup-ts/ + - uses: actions/cache@v2 + name: Cache Solana Tool Suite + id: cache-solana + with: + path: | + ~/.cache/solana/ + ~/.local/share/solana/ + key: solana-${{ runner.os }}-v0000-1.8.14 + # using an outdated validator but that + # is ok as long as the test doesn't + # include newer incompatible features + - run: sh -c "$(curl -sSfL https://release.solana.com/v1.8.14/install)" + shell: bash + - run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH + shell: bash + - run: solana-keygen new --no-bip39-passphrase + shell: bash + - run: solana config set --url localhost + shell: bash + - uses: actions/download-artifact@v2 + with: + name: anchor-binary + path: ~/.cargo/bin/ + - run: chmod +x ~/.cargo/bin/anchor + - uses: actions/cache@v2 + name: Cache tests/misc target + id: cache-test-target + with: + path: tests/misc/target + key: cargo-${{ runner.os }}-tests/misc-${{ env.ANCHOR_VERSION }}-1.8.14-${{ hashFiles('**/Cargo.lock') }} + + - run: cd tests/misc && yarn --frozen-lockfile + - run: cd tests/misc && yarn link @project-serum/anchor + - run: cd tests/misc && chmod +x ci.sh && ./ci.sh + - run: cd tests/misc && anchor test --skip-lint + test-anchor-init: needs: setup-anchor-cli name: Test Anchor Init diff --git a/CHANGELOG.md b/CHANGELOG.md index 59f1faf5..668c235c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The minor version will be incremented upon a breaking change and the patch versi * avm: `amv install` switches to the newly installed version after installation finishes ([#1670](https://github.com/project-serum/anchor/pull/1670)). * spl: Re-export the `spl_token` crate ([#1665](https://github.com/project-serum/anchor/pull/1665)). +* lang, cli, spl: Update solana toolchain to v1.9.13 ([#1653](https://github.com/project-serum/anchor/pull/1653)). ## [0.23.0] - 2022-03-20 diff --git a/Cargo.lock b/Cargo.lock index 81e68cd9..fa003ac2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -285,6 +285,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + [[package]] name = "assert_matches" version = "1.5.0" @@ -313,7 +319,7 @@ name = "avm" version = "0.23.0" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "clap 3.1.6", "dirs 1.0.5", "once_cell", @@ -333,12 +339,11 @@ checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", - "serde", ] [[package]] @@ -347,12 +352,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" @@ -376,9 +375,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blake2b_simd" @@ -387,35 +386,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.2", "constant_time_eq", ] [[package]] name = "blake3" -version = "0.3.8" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.7.2", "cc", - "cfg-if 0.1.10", + "cfg-if", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", + "digest 0.10.3", ] [[package]] @@ -424,17 +410,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.5", + "block-padding", + "generic-array", ] [[package]] -name = "block-padding" -version = "0.1.5" +name = "block-buffer" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "byte-tools", + "generic-array", ] [[package]] @@ -516,12 +502,6 @@ dependencies = [ "serde", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" version = "1.8.0" @@ -548,23 +528,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "either", - "iovec", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.1.0" @@ -573,9 +536,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bzip2" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" dependencies = [ "bzip2-sys", "libc", @@ -623,12 +586,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -694,47 +651,6 @@ dependencies = [ "syn 1.0.88", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "console" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c0994e656bba7b922d8dd1245db90672ffb701e684e45be58f20719d69abc5a" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "regex", - "terminal_size", - "termios", - "unicode-width", - "winapi", - "winapi-util", -] - -[[package]] -name = "console" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "regex", - "terminal_size", - "unicode-width", - "winapi", -] - [[package]] name = "console" version = "0.15.0" @@ -750,6 +666,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +dependencies = [ + "log", + "web-sys", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -787,17 +723,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", ] [[package]] @@ -806,8 +732,8 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdbfe11fe19ff083c48923cf179540e8cd0535903dc35e178a1fdeeb59aef51f" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "cfg-if", + "crossbeam-utils", ] [[package]] @@ -816,9 +742,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -828,31 +754,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.8", + "cfg-if", + "crossbeam-utils", "lazy_static", "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - [[package]] name = "crossbeam-utils" version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -862,13 +777,23 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.5", + "generic-array", "subtle", ] @@ -878,33 +803,20 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" dependencies = [ - "generic-array 0.14.5", + "generic-array", "subtle", ] [[package]] name = "crypto-mac" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.5", + "generic-array", "subtle", ] -[[package]] -name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" -dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -924,7 +836,7 @@ version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "num_cpus", "rayon", ] @@ -940,22 +852,14 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.6.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aa86af7b19b40ef9cbef761ed411a49f0afa06b7b6dcd3dfe2f96a3c546138" +checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb" dependencies = [ - "console 0.11.3", + "console", "lazy_static", "tempfile", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", + "zeroize", ] [[package]] @@ -964,7 +868,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.5", + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle", ] [[package]] @@ -1002,7 +917,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1057,7 +972,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39" dependencies = [ - "serde", "signature", ] @@ -1067,11 +981,10 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek", "ed25519", "rand 0.7.3", "serde", - "serde_bytes", "sha2", "zeroize", ] @@ -1107,7 +1020,7 @@ version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1132,9 +1045,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -1186,12 +1099,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fastrand" version = "1.7.0" @@ -1223,7 +1130,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.2.11", "winapi", @@ -1235,7 +1142,7 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crc32fast", "libc", "miniz_oxide", @@ -1272,6 +1179,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "futures" version = "0.3.21" @@ -1361,15 +1274,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.5" @@ -1397,7 +1301,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", @@ -1410,7 +1314,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.10.0+wasi-snapshot-preview1", ] @@ -1421,19 +1325,13 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - [[package]] name = "h2" version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1479,12 +1377,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hidapi" version = "1.3.4" @@ -1518,11 +1410,11 @@ dependencies = [ [[package]] name = "hmac" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.10.1", + "crypto-mac 0.11.1", "digest 0.9.0", ] @@ -1533,7 +1425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.5", + "generic-array", "hmac 0.8.1", ] @@ -1543,7 +1435,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "itoa", ] @@ -1554,7 +1446,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ - "bytes 1.1.0", + "bytes", "http", "pin-project-lite", ] @@ -1583,7 +1475,7 @@ version = "0.14.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -1594,7 +1486,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.4", + "socket2", "tokio", "tower-service", "tracing", @@ -1620,7 +1512,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.1.0", + "bytes", "hyper", "native-tls", "tokio", @@ -1638,6 +1530,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "index_list" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" + [[package]] name = "indexmap" version = "1.8.0" @@ -1650,41 +1548,23 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" dependencies = [ - "console 0.15.0", + "console", "lazy_static", "number_prefix", "regex", ] -[[package]] -name = "input_buffer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" -dependencies = [ - "bytes 0.5.6", -] - [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", + "cfg-if", ] [[package]] @@ -1761,9 +1641,6 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin", -] [[package]] name = "libc" @@ -1773,19 +1650,19 @@ checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" [[package]] name = "libloading" -version = "0.6.7" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] [[package]] name = "libsecp256k1" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd1137239ab33b41aa9637a88a28249e5e70c40a42ccc92db7f12cc356c1fcd7" +checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" dependencies = [ "arrayref", "base64 0.12.3", @@ -1835,15 +1712,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.6" @@ -1859,7 +1727,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1868,12 +1736,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.4.1" @@ -1882,9 +1744,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap2" -version = "0.1.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" dependencies = [ "libc", ] @@ -1965,26 +1827,15 @@ dependencies = [ "tempfile", ] -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi", -] - [[package]] name = "nix" -version = "0.20.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] @@ -2061,9 +1912,9 @@ dependencies = [ [[package]] name = "number_prefix" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" @@ -2080,12 +1931,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -2099,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2136,9 +1981,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.10.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84236d64f1718c387232287cf036eb6632a5ecff226f4ff9dccb8c2b79ba0bde" +checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" dependencies = [ "aliasable", "ouroboros_macro", @@ -2147,9 +1992,9 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.10.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f463857a6eb96c0136b1d56e56c718350cef30412ec065b48294799a088bca68" +checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" dependencies = [ "Inflector", "proc-macro-error", @@ -2160,12 +2005,13 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", + "instant", + "lock_api", + "parking_lot_core 0.8.5", ] [[package]] @@ -2174,20 +2020,20 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ - "lock_api 0.4.6", + "lock_api", "parking_lot_core 0.9.1", ] [[package]] name = "parking_lot_core" -version = "0.7.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 0.1.10", - "cloudabi", + "cfg-if", + "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall 0.2.11", "smallvec", "winapi", ] @@ -2198,7 +2044,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.2.11", "smallvec", @@ -2222,11 +2068,11 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.6.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" +checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" dependencies = [ - "crypto-mac 0.10.1", + "crypto-mac 0.11.1", ] [[package]] @@ -2467,9 +2313,9 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.5.3", + "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.8", + "crossbeam-utils", "lazy_static", "num_cpus", ] @@ -2543,7 +2389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ "base64 0.13.0", - "bytes 1.1.0", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -2595,9 +2441,9 @@ dependencies = [ [[package]] name = "rpassword" -version = "4.0.5" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", "winapi", @@ -2612,7 +2458,7 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.8", + "crossbeam-utils", ] [[package]] @@ -2627,15 +2473,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" @@ -2751,22 +2588,13 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -2775,12 +2603,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "semver-parser" version = "0.10.2" @@ -2879,14 +2701,15 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.8.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", ] [[package]] @@ -2896,10 +2719,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -2911,7 +2734,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "keccak", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -2950,17 +2773,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.4.4" @@ -2973,14 +2785,14 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c1304620ee4a570462869615f3ce1b4c3500c8675110425d7aff99a2c38679" +checksum = "9ea6959495ecaf5e943d19878afa9c2cde1e7259c539a0a482a2f78323ce4876" dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58 0.3.1", + "bs58 0.4.0", "bv", "lazy_static", "serde", @@ -2995,10 +2807,30 @@ dependencies = [ ] [[package]] -name = "solana-bloom" -version = "1.8.14" +name = "solana-address-lookup-table-program" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe05f0c59be2ab5283756a707e12ecb39706bfa4f73af668c43738446f7f6521" +checksum = "3bf6816169fcbf70d6ddd977756990a4d56ec02eee09d2f3d2e28e8a8c97510f" +dependencies = [ + "bincode", + "bytemuck", + "log", + "num-derive", + "num-traits", + "rustc_version 0.4.0", + "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-program-runtime", + "solana-sdk", + "thiserror", +] + +[[package]] +name = "solana-bloom" +version = "1.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6210a39c4a217c46dfefb91af15d72a81bfc4410c41b1ed95b0990ae039af4f" dependencies = [ "bv", "fnv", @@ -3014,10 +2846,27 @@ dependencies = [ ] [[package]] -name = "solana-clap-utils" -version = "1.8.14" +name = "solana-bucket-map" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d5da8ba4565446a2a7c0e89853ba255fc5ef5063509bb36e74e143735b0013" +checksum = "ee7acda82f2c8bbd1199c5d90a920fe7c429d676cabf0081defd9836392ad3d8" +dependencies = [ + "fs_extra", + "log", + "memmap2", + "rand 0.7.3", + "rayon", + "solana-logger", + "solana-measure", + "solana-sdk", + "tempfile", +] + +[[package]] +name = "solana-clap-utils" +version = "1.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f6171679f56afa12559c9849cd6cde67957781e8363c103787b680df02cedb" dependencies = [ "chrono", "clap 2.34.0", @@ -3033,9 +2882,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f6ac179411758ad6a4ad8033974ea16e17f0b72e40be404a9c9fe4665daa1" +checksum = "0866ac61c734701c2c782701d99342176b3c88ec47cd3f73994cdd5f57b151b0" dependencies = [ "dirs-next", "lazy_static", @@ -3047,27 +2896,27 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f03617eeca735cd62370d135bdc18ee9bd3639d45ceff4034b0bb095e534df" +checksum = "90c3cd0299b1cf59b5ad6a96ea7db9306e93e66ef395bed80ed5df960685083b" dependencies = [ "base64 0.13.0", "bincode", - "bs58 0.3.1", + "bs58 0.4.0", "clap 2.34.0", "indicatif", "jsonrpc-core", "log", - "net2", "rayon", "reqwest", - "semver 0.11.0", + "semver 1.0.6", "serde", "serde_derive", "serde_json", "solana-account-decoder", "solana-clap-utils", "solana-faucet", + "solana-measure", "solana-net-utils", "solana-sdk", "solana-transaction-status", @@ -3081,66 +2930,33 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bbba7d245abb7b6b9384ce6bca76f8bec34f8aa5e933613c3bf0ac1b58ba77" +checksum = "c9b3bf6b0916134a92b5c87690181680a63d22e20dda8ec6ba05260afbae50a0" dependencies = [ + "solana-program-runtime", "solana-sdk", ] [[package]] name = "solana-config-program" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d9fccdec6f246264b289b3d2ff7e9f23b7f5cd5c150c6245db38d27396dfd25" +checksum = "3ec25faf104c84393f7b4a549e08e952b9ba46c5df283adc59440f32fdce9789" dependencies = [ "bincode", "chrono", - "log", - "rand_core 0.6.3", "serde", "serde_derive", - "solana-sdk", -] - -[[package]] -name = "solana-crate-features" -version = "1.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7aacb3780ddb5b5f1271bd1245571de59dfafd1ccea6b9ca311292e6257752" -dependencies = [ - "backtrace", - "bytes 0.4.12", - "cc", - "curve25519-dalek 2.1.3", - "ed25519-dalek", - "either", - "lazy_static", - "libc", - "rand_chacha 0.2.2", - "regex-syntax", - "reqwest", - "ring", - "serde", - "syn 0.15.44", - "syn 1.0.88", - "winapi", -] - -[[package]] -name = "solana-ed25519-program" -version = "1.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a29981f1d2b22b620d6ca786fcdc1a3313f0ec084fe98727be40cce165f3e99" -dependencies = [ + "solana-program-runtime", "solana-sdk", ] [[package]] name = "solana-faucet" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cac397bcaf0f5e560639ae691235a13cd7042fd97dab4b900018fb414e3b72b" +checksum = "77dc0e506f92d215422a9cdd6cd3f10a237c5b56ea14bf0bccbf414ecfa404ff" dependencies = [ "bincode", "byteorder", @@ -3161,16 +2977,16 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3495c76034ef52472ff4c5cd82f513073b415a7ac962d9a8aefe906a216e6392" +checksum = "34c9effc54db26704db05c474254e50a69fbd4c527df13aead8c8e38db127d7c" dependencies = [ - "bs58 0.3.1", + "bs58 0.4.0", "bv", - "generic-array 0.14.5", + "generic-array", "log", "memmap2", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", "serde_derive", "sha2", @@ -3181,21 +2997,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2193bd0e23b5bc93fce0533248c43b8aa53b27a91298e49d6fd018f51c43138" +checksum = "d343b3e8f168d009365acc13654ebbecbcd7d98e7100eaf9fdcd2a59a2d99706" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.15", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "syn 1.0.88", ] [[package]] name = "solana-logger" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4adacba4cc6b9d39899718fff3e312b32496ae44e570dfeff23d8b7ac60ad79" +checksum = "b5aea113f74b8ace6baf51256daf9d5228b6c65a774fe21a4416dd7e270d5dd4" dependencies = [ "env_logger", "lazy_static", @@ -3204,20 +3020,19 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd8f16859d4e84f5552ca911889052f2b60b84676ca17225ad67c3060283208" +checksum = "e48319495b1f657cd1d534903604f568b152b5a264186a632007dd67b9064d2c" dependencies = [ "log", - "solana-metrics", "solana-sdk", ] [[package]] name = "solana-metrics" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d8a176edc331f2edad8f25d764c91eb8b185c5161f24b5eb8d5a32870c282" +checksum = "d0fd8731b61c473f5d22e8180119ed84b5de3352d6c46023dbe48a9b94a342c0" dependencies = [ "env_logger", "gethostname", @@ -3229,9 +3044,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cab35690808e345750435b451b441f8fe6c32ddafe6f2b724ac9d8e2fad1eeb" +checksum = "304714450324398cabf5b23f8d69122bd0ae6487d67dd89394692b9c2c2409c8" dependencies = [ "bincode", "clap 2.34.0", @@ -3240,8 +3055,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2 0.3.19", - "solana-clap-utils", + "socket2", "solana-logger", "solana-sdk", "solana-version", @@ -3251,16 +3065,18 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3aaa73acee6e4ced74f607ef53b3bbac0b8598bff06c95c790e8068d9c5a948" +checksum = "e08fb7143916963e7aaefff3be26a9d2046559b2c0cbaf2d97a5d064f9f28aed" dependencies = [ "ahash", "bincode", + "bv", "caps", - "curve25519-dalek 2.1.3", + "curve25519-dalek", "dlopen", "dlopen_derive", + "fnv", "lazy_static", "libc", "log", @@ -3278,28 +3094,33 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f706757ff4b34f0f1fac72204bb2bfbda3c1a939c6c72ae25f1b31635d08bb" +checksum = "9b838bfabf09050f5f66cadf5e486fd415242165f06c9f9aed45162efb68c711" dependencies = [ "base64 0.13.0", "bincode", + "bitflags", "blake3", "borsh", "borsh-derive", - "bs58 0.3.1", + "bs58 0.4.0", "bv", "bytemuck", - "curve25519-dalek 2.1.3", - "hex", - "itertools 0.9.0", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.1.16", + "itertools 0.10.3", + "js-sys", "lazy_static", "libsecp256k1", "log", "num-derive", "num-traits", + "parking_lot 0.11.2", "rand 0.7.3", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", @@ -3311,13 +3132,38 @@ dependencies = [ "solana-logger", "solana-sdk-macro", "thiserror", + "wasm-bindgen", +] + +[[package]] +name = "solana-program-runtime" +version = "1.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f62c8ba176714b0c8e61ee0b9d2966a8470a85cba0f8cdf0e03ce05f0274f993" +dependencies = [ + "base64 0.13.0", + "bincode", + "itertools 0.10.3", + "libc", + "libloading", + "log", + "num-derive", + "num-traits", + "rustc_version 0.4.0", + "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-logger", + "solana-measure", + "solana-sdk", + "thiserror", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "012936dd1e5ee19682ba4d09ee628c2ef33ba64988e38415efa6905084f3b283" +checksum = "c2141deb1e2b832e3a5c2faca05caae03c1603cba1c00f032979e41f8dad4271" dependencies = [ "lazy_static", "num_cpus", @@ -3325,20 +3171,20 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f009d977623835959420767d1d9db3b19b3cdac9ff57701f2449d453a2c2d7ee" +checksum = "db96445daeac9cdc7a63e67fd8e7cf2bacc492aab4c88d6511418c026f66885d" dependencies = [ "base32", - "console 0.14.1", + "console", "dialoguer", "hidapi", "log", "num-derive", "num-traits", - "parking_lot 0.10.2", + "parking_lot 0.11.2", "qstring", - "semver 0.9.0", + "semver 1.0.6", "solana-sdk", "thiserror", "uriparse", @@ -3346,25 +3192,25 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c534268069387e3f72a3c68a03e3d255b821730b8cc509ebec892a8facbb1300" +checksum = "4082b20f9cdf699bbb6d00e9a070f1944903e7a42eb57aec531bf64395e9b7dd" dependencies = [ "arrayref", "bincode", "blake3", "bv", + "bytemuck", "byteorder", "bzip2", - "crossbeam-channel 0.4.4", + "crossbeam-channel", "dashmap", "dir-diff", "flate2", "fnv", + "index_list", "itertools 0.10.3", "lazy_static", - "libc", - "libloading", "log", "memmap2", "num-derive", @@ -3374,21 +3220,22 @@ dependencies = [ "rand 0.7.3", "rayon", "regex", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", "serde_derive", + "solana-address-lookup-table-program", "solana-bloom", + "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", - "solana-ed25519-program", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", "solana-measure", "solana-metrics", + "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", - "solana-secp256k1-program", "solana-stake-program", "solana-vote-program", "symlink", @@ -3400,17 +3247,16 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a0f8b4cd2eed1b5e5ea5674cc9e38018645922aa1db4b93d06a741ae8b7fe8" +checksum = "463899455a4a5f92a70c57880b57642432c32a5ab94d60bd126775d7349d7ec6" dependencies = [ "assert_matches", "base64 0.13.0", "bincode", + "bitflags", "borsh", - "borsh-derive", "bs58 0.4.0", - "bv", "bytemuck", "byteorder", "chrono", @@ -3418,22 +3264,21 @@ dependencies = [ "digest 0.9.0", "ed25519-dalek", "ed25519-dalek-bip32", - "generic-array 0.14.5", - "hex", - "hmac 0.10.1", - "itertools 0.9.0", + "generic-array", + "hmac 0.11.0", + "itertools 0.10.3", + "js-sys", "lazy_static", "libsecp256k1", "log", "memmap2", "num-derive", "num-traits", - "pbkdf2 0.6.0", + "pbkdf2 0.9.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", - "rand_core 0.6.3", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", @@ -3441,7 +3286,6 @@ dependencies = [ "serde_json", "sha2", "sha3", - "solana-crate-features", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -3449,47 +3293,40 @@ dependencies = [ "solana-sdk-macro", "thiserror", "uriparse", + "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc226c8458927a632f152e44c80b5eb69e1ea74af444a026a617dd5d691bd9" +checksum = "b25759d80a81f0303b2827344b365f886a74306fa6af7c898921333d04d1c99b" dependencies = [ - "bs58 0.3.1", + "bs58 0.4.0", "proc-macro2 1.0.36", "quote 1.0.15", "rustversion", "syn 1.0.88", ] -[[package]] -name = "solana-secp256k1-program" -version = "1.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd21f5828bd41811bf3847b69a8971cabc976fb62a616904bf7b39ea3da4cf0" -dependencies = [ - "solana-sdk", -] - [[package]] name = "solana-stake-program" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a563363277e9d933fc1487b682ce9b7e2ae7a832d64fcbbe9a27d1fd4397d1" +checksum = "77874f460d867b58bf7d56a3acf805abe0891b2fce8cc561bce71cc3cb87778d" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", "serde_derive", "solana-config-program", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", + "solana-program-runtime", "solana-sdk", "solana-vote-program", "thiserror", @@ -3497,14 +3334,14 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6e2dd8d443b576cf6690bf21ee0251dfeeb4d98c6fc256d9746bb2d9b462a5" +checksum = "7dcbbcd699039257fa62a11e797ab7de932431344e33d416e2793e2cae105d8b" dependencies = [ "Inflector", "base64 0.12.3", "bincode", - "bs58 0.3.1", + "bs58 0.4.0", "lazy_static", "log", "serde", @@ -3524,37 +3361,37 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1639798878b48fbf66f5d93df1b86209f722afe265d31eb6ab6d41d5c032747" +checksum = "977ae37ed94ac11bbd10e534a972e97f44cf83f1be02ab6c147854cea071b35c" dependencies = [ "log", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", "serde_derive", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-logger", "solana-sdk", ] [[package]] name = "solana-vote-program" -version = "1.8.14" +version = "1.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec510e5dc644aa423260e01ac10341f56b2d16ac796e74cdaa41f603a61ffbf" +checksum = "1d80020b9981aaa45b9f4ce6080a1dc9f1deb25f0553659c25da3acf2437974f" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version 0.2.3", + "rustc_version 0.4.0", "serde", "serde_derive", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", "solana-metrics", + "solana-program-runtime", "solana-sdk", "thiserror", ] @@ -3685,7 +3522,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall 0.2.11", @@ -3712,15 +3549,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -3807,7 +3635,7 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ - "bytes 1.1.0", + "bytes", "libc", "memchr", "mio", @@ -3816,7 +3644,7 @@ dependencies = [ "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", "winapi", ] @@ -3859,7 +3687,7 @@ version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-sink", "log", @@ -3888,7 +3716,7 @@ version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "pin-project-lite", "tracing-core", ] @@ -3910,22 +3738,24 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.10.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfea31758bf674f990918962e8e5f07071a3161bd7c4138ed23e416e1ac4264e" +checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" dependencies = [ - "base64 0.11.0", + "base64 0.13.0", "byteorder", - "bytes 0.5.6", + "bytes", "http", "httparse", - "input_buffer", "log", - "native-tls", - "rand 0.7.3", + "rand 0.8.5", + "rustls", "sha-1", + "thiserror", "url", "utf-8", + "webpki", + "webpki-roots", ] [[package]] @@ -4085,7 +3915,7 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -4110,7 +3940,7 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4313,18 +4143,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.5.4+zstd.1.4.7" +version = "0.9.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" +checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" +version = "4.1.3+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" +checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" dependencies = [ "libc", "zstd-sys", @@ -4332,12 +4162,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" +version = "1.6.2+zstd.1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" +checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" dependencies = [ "cc", - "glob", - "itertools 0.9.0", "libc", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 2b27bc59..b4d3b06c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -25,11 +25,11 @@ shellexpand = "2.1.0" toml = "0.5.8" semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } -solana-sdk = "~1.8.14" -solana-program = "~1.8.14" -solana-client = "~1.8.14" -solana-cli-config = "~1.8.14" -solana-faucet = "~1.8.14" +solana-sdk = "~1.9.13" +solana-program = "~1.9.13" +solana-client = "~1.9.13" +solana-cli-config = "~1.9.13" +solana-faucet = "~1.9.13" dirs = "3.0" heck = "0.3.1" flate2 = "1.0.19" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index fdb63474..f10420a0 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -1558,12 +1558,12 @@ fn idl_set_buffer(cfg_override: &ConfigOverride, program_id: Pubkey, buffer: Pub }; // Build the transaction. - let (recent_hash, _fee_calc) = client.get_recent_blockhash()?; + let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( &[set_buffer_ix], Some(&keypair.pubkey()), &[&keypair], - recent_hash, + latest_hash, ); // Send the transaction. @@ -1649,12 +1649,12 @@ fn idl_set_authority( data, }; // Send transaction. - let (recent_hash, _fee_calc) = client.get_recent_blockhash()?; + let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( &[ix], Some(&keypair.pubkey()), &[&keypair], - recent_hash, + latest_hash, ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, @@ -1734,12 +1734,12 @@ fn idl_write(cfg: &Config, program_id: &Pubkey, idl: &Idl, idl_address: Pubkey) data, }; // Send transaction. - let (recent_hash, _fee_calc) = client.get_recent_blockhash()?; + let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( &[ix], Some(&keypair.pubkey()), &[&keypair], - recent_hash, + latest_hash, ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, @@ -2179,7 +2179,7 @@ fn start_test_validator( .and_then(|test| test.startup_wait) .unwrap_or(5_000); while count < ms_wait { - let r = client.get_recent_blockhash(); + let r = client.get_latest_blockhash(); if r.is_ok() { break; } @@ -2188,7 +2188,7 @@ fn start_test_validator( } if count == ms_wait { eprintln!( - "Unable to get recent blockhash. Test validator does not look started. Check {} for errors. Consider increasing [test.startup_wait] in Anchor.toml.", + "Unable to get latest blockhash. Test validator does not look started. Check {} for errors. Consider increasing [test.startup_wait] in Anchor.toml.", test_ledger_log_filename ); validator_handle.kill()?; @@ -2408,12 +2408,12 @@ fn create_idl_account( accounts, data, }; - let (recent_hash, _fee_calc) = client.get_recent_blockhash()?; + let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( &[ix], Some(&keypair.pubkey()), &[&keypair], - recent_hash, + latest_hash, ); client.send_and_confirm_transaction_with_spinner_and_config( &tx, @@ -2474,12 +2474,12 @@ fn create_idl_buffer( }; // Build the transaction. - let (recent_hash, _fee_calc) = client.get_recent_blockhash()?; + let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( &[create_account_ix, create_buffer_ix], Some(&keypair.pubkey()), &[&keypair, &buffer], - recent_hash, + latest_hash, ); // Send the transaction. diff --git a/client/src/lib.rs b/client/src/lib.rs index af791758..b3291ac2 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -544,12 +544,12 @@ impl<'a> RequestBuilder<'a> { let rpc_client = RpcClient::new_with_commitment(self.cluster, self.options); let tx = { - let (recent_hash, _fee_calc) = rpc_client.get_recent_blockhash()?; + let latest_hash = rpc_client.get_latest_blockhash()?; Transaction::new_signed_with_payer( &instructions, Some(&self.payer.pubkey()), &signers, - recent_hash, + latest_hash, ) }; diff --git a/docker/Makefile b/docker/Makefile index 697bca07..4374dc1f 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print # # Solana toolchain. # -SOLANA_CLI=v1.8.14 +SOLANA_CLI=v1.9.13 # # Build version should match the Anchor cli version. # diff --git a/lang/Cargo.toml b/lang/Cargo.toml index c5a880aa..aae131de 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -39,6 +39,6 @@ arrayref = "0.3.6" base64 = "0.13.0" borsh = "0.9" bytemuck = "1.4.0" -solana-program = "~1.8.14" +solana-program = "~1.9.13" thiserror = "1.0.20" bincode = "1.3.3" diff --git a/lang/src/lib.rs b/lang/src/lib.rs index c798b42c..915d8a19 100644 --- a/lang/src/lib.rs +++ b/lang/src/lib.rs @@ -254,9 +254,7 @@ pub mod prelude { pub use solana_program::pubkey::Pubkey; pub use solana_program::sysvar::clock::Clock; pub use solana_program::sysvar::epoch_schedule::EpochSchedule; - pub use solana_program::sysvar::fees::Fees; pub use solana_program::sysvar::instructions::Instructions; - pub use solana_program::sysvar::recent_blockhashes::RecentBlockhashes; pub use solana_program::sysvar::rent::Rent; pub use solana_program::sysvar::rewards::Rewards; pub use solana_program::sysvar::slot_hashes::SlotHashes; diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 83b21f32..a038c1dc 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -20,6 +20,6 @@ dex = ["serum_dex"] [dependencies] anchor-lang = { path = "../lang", version = "0.23.0", features = ["derive"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } -solana-program = "~1.8.14" +solana-program = "~1.9.13" spl-token = { version = "3.1.1", features = ["no-entrypoint"], optional = true } spl-associated-token-account = { version = "1.0.3", features = ["no-entrypoint"], optional = true } diff --git a/tests/auction-house b/tests/auction-house index 63e7bb81..967650c5 160000 --- a/tests/auction-house +++ b/tests/auction-house @@ -1 +1 @@ -Subproject commit 63e7bb81beb76f2722245a37c16a7b0b00d6905a +Subproject commit 967650c531ba0f23c88374875ccfcecb9b1a7800 diff --git a/tests/misc/Anchor.toml b/tests/misc/Anchor.toml index 12cd6435..30bc243f 100644 --- a/tests/misc/Anchor.toml +++ b/tests/misc/Anchor.toml @@ -3,7 +3,7 @@ cluster = "localnet" wallet = "~/.config/solana/id.json" [programs.localnet] -misc = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" +misc = "3TEqcc8xhrhdspwbvoamUJe2borm4Nr72JxL66k6rgrh" misc2 = "HmbTLCmaGvZhKnn1Zfa1JVnp7vkMV4DYVxPLWBVoN65L" [[test.genesis]] diff --git a/tests/misc/ci.sh b/tests/misc/ci.sh new file mode 100755 index 00000000..6648ddc5 --- /dev/null +++ b/tests/misc/ci.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# this script ensures that the Misc test does not +# test the miscNonRentExempt.ts during its test in the ci +# because the misc test uses a newer solana version +# than the miscNonRentExempt one. The latter needs to be on +# a validator with a version < 1.9, so it can test +# whether anchor's rent-exemption checks work for +# legacy accounts which dont have to be rent-exempt +rm ./tests/misc.ts +mv miscNonRentExempt.ts ./tests/miscNonRentExempt.ts diff --git a/tests/misc/miscNonRentExempt.ts b/tests/misc/miscNonRentExempt.ts new file mode 100644 index 00000000..03bfa6d6 --- /dev/null +++ b/tests/misc/miscNonRentExempt.ts @@ -0,0 +1,135 @@ +import * as anchor from "@project-serum/anchor"; +import { Program, BN, IdlAccounts, AnchorError } from "@project-serum/anchor"; +import { + PublicKey, + Keypair, + SystemProgram, + SYSVAR_RENT_PUBKEY, +} from "@solana/web3.js"; +import { Misc } from "../target/types/misc"; +const { assert } = require("chai"); + +describe("miscNonRentExempt", () => { + // Configure the client to use the local cluster. + anchor.setProvider(anchor.Provider.env()); + const program = anchor.workspace.Misc as Program; + + it("init_if_needed checks rent_exemption if init is not needed", async () => { + const data = Keypair.generate(); + await program.rpc.initDecreaseLamports({ + accounts: { + data: data.publicKey, + user: anchor.getProvider().wallet.publicKey, + systemProgram: SystemProgram.programId, + }, + signers: [data], + }); + + try { + await program.rpc.initIfNeededChecksRentExemption({ + accounts: { + data: data.publicKey, + user: anchor.getProvider().wallet.publicKey, + systemProgram: SystemProgram.programId, + }, + signers: [data], + }); + assert.ok(false); + } catch (_err) { + assert.isTrue(_err instanceof AnchorError); + const err: AnchorError = _err; + assert.strictEqual(err.error.errorCode.number, 2005); + } + }); + + it("allows non-rent exempt accounts", async () => { + const data = Keypair.generate(); + await program.rpc.initializeNoRentExempt({ + accounts: { + data: data.publicKey, + rent: SYSVAR_RENT_PUBKEY, + }, + signers: [data], + instructions: [ + SystemProgram.createAccount({ + programId: program.programId, + space: 8 + 16 + 16, + lamports: + await program.provider.connection.getMinimumBalanceForRentExemption( + 39 + ), + fromPubkey: anchor.getProvider().wallet.publicKey, + newAccountPubkey: data.publicKey, + }), + ], + }); + await program.rpc.testNoRentExempt({ + accounts: { + data: data.publicKey, + }, + }); + }); + + it("allows rent exemption to be skipped", async () => { + const data = anchor.web3.Keypair.generate(); + await program.rpc.initializeSkipRentExempt({ + accounts: { + data: data.publicKey, + rent: SYSVAR_RENT_PUBKEY, + }, + signers: [data], + instructions: [ + SystemProgram.createAccount({ + programId: program.programId, + space: 8 + 16 + 16, + lamports: + await program.provider.connection.getMinimumBalanceForRentExemption( + 39 + ), + fromPubkey: anchor.getProvider().wallet.publicKey, + newAccountPubkey: data.publicKey, + }), + ], + }); + }); + + it("can use rent_exempt to enforce rent exemption", async () => { + const data = Keypair.generate(); + await program.rpc.initializeSkipRentExempt({ + accounts: { + data: data.publicKey, + rent: SYSVAR_RENT_PUBKEY, + }, + signers: [data], + instructions: [ + SystemProgram.createAccount({ + programId: program.programId, + space: 8 + 16 + 16, + lamports: + await program.provider.connection.getMinimumBalanceForRentExemption( + 39 + ), + fromPubkey: anchor.getProvider().wallet.publicKey, + newAccountPubkey: data.publicKey, + }), + ], + }); + + try { + await program.rpc.testEnforceRentExempt({ + accounts: { + data: data.publicKey, + }, + }); + assert.ok(false); + } catch (_err) { + assert.isTrue(_err instanceof AnchorError); + const err: AnchorError = _err; + assert.strictEqual(err.error.errorCode.number, 2005); + assert.strictEqual( + "A rent exemption constraint was violated", + err.error.errorMessage + ); + } + }); +}); diff --git a/tests/misc/programs/misc/src/lib.rs b/tests/misc/programs/misc/src/lib.rs index fa09a7e9..149ce654 100644 --- a/tests/misc/programs/misc/src/lib.rs +++ b/tests/misc/programs/misc/src/lib.rs @@ -11,7 +11,7 @@ mod account; mod context; mod event; -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); +declare_id!("3TEqcc8xhrhdspwbvoamUJe2borm4Nr72JxL66k6rgrh"); #[constant] pub const BASE: u128 = 1_000_000; diff --git a/tests/misc/tests/misc.ts b/tests/misc/tests/misc.ts index f8c4e0de..f02d7f1a 100644 --- a/tests/misc/tests/misc.ts +++ b/tests/misc/tests/misc.ts @@ -12,6 +12,7 @@ import { ASSOCIATED_TOKEN_PROGRAM_ID, } from "@solana/spl-token"; import { Misc } from "../target/types/misc"; +import { Misc2 } from "../target/types/misc2"; const utf8 = anchor.utils.bytes.utf8; const { assert } = require("chai"); const nativeAssert = require("assert"); @@ -20,8 +21,8 @@ const miscIdl = require("../target/idl/misc.json"); describe("misc", () => { // Configure the client to use the local cluster. anchor.setProvider(anchor.Provider.env()); - const program = anchor.workspace.Misc; - const misc2Program = anchor.workspace.Misc2; + const program = anchor.workspace.Misc as Program; + const misc2Program = anchor.workspace.Misc2 as Program; it("Can allocate extra space for a state constructor", async () => { const tx = await program.state.rpc.new(); @@ -152,15 +153,15 @@ describe("misc", () => { it("Can retrieve events when simulating a transaction", async () => { const resp = await program.simulate.testSimulate(44); const expectedRaw = [ - "Program Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS invoke [1]", + "Program 3TEqcc8xhrhdspwbvoamUJe2borm4Nr72JxL66k6rgrh invoke [1]", "Program log: Instruction: TestSimulate", "Program data: NgyCA9omwbMsAAAA", "Program data: fPhuIELK/k7SBAAA", "Program data: jvbowsvlmkcJAAAA", "Program data: zxM5neEnS1kBAgMEBQYHCAkK", "Program data: g06Ei2GL1gIBAgMEBQYHCAkKCw==", - "Program Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS consumed 5320 of 200000 compute units", - "Program Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS success", + "Program 3TEqcc8xhrhdspwbvoamUJe2borm4Nr72JxL66k6rgrh consumed 5395 of 1400000 compute units", + "Program 3TEqcc8xhrhdspwbvoamUJe2borm4Nr72JxL66k6rgrh success", ]; assert.deepStrictEqual(expectedRaw, resp.raw); @@ -1456,34 +1457,6 @@ describe("misc", () => { } }); - it("init_if_needed checks rent_exemption if init is not needed", async () => { - const data = anchor.web3.Keypair.generate(); - await program.rpc.initDecreaseLamports({ - accounts: { - data: data.publicKey, - user: anchor.getProvider().wallet.publicKey, - systemProgram: SystemProgram.programId, - }, - signers: [data], - }); - - try { - await program.rpc.initIfNeededChecksRentExemption({ - accounts: { - data: data.publicKey, - user: anchor.getProvider().wallet.publicKey, - systemProgram: SystemProgram.programId, - }, - signers: [data], - }); - assert.ok(false); - } catch (_err) { - assert.isTrue(_err instanceof AnchorError); - const err: AnchorError = _err; - assert.strictEqual(err.error.errorCode.number, 2005); - } - }); - it("Can use multidimensional array", async () => { const array2d = new Array(10).fill(new Array(10).fill(99)); const data = anchor.web3.Keypair.generate(); @@ -1525,97 +1498,6 @@ describe("misc", () => { assert.deepStrictEqual(dataAccount.data, array2d); }); - it("allows non-rent exempt accounts", async () => { - const data = anchor.web3.Keypair.generate(); - await program.rpc.initializeNoRentExempt({ - accounts: { - data: data.publicKey, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }, - signers: [data], - instructions: [ - SystemProgram.createAccount({ - programId: program.programId, - space: 8 + 16 + 16, - lamports: - await program.provider.connection.getMinimumBalanceForRentExemption( - 39 - ), - fromPubkey: anchor.getProvider().wallet.publicKey, - newAccountPubkey: data.publicKey, - }), - ], - }); - await program.rpc.testNoRentExempt({ - accounts: { - data: data.publicKey, - }, - }); - }); - - it("allows rent exemption to be skipped", async () => { - const data = anchor.web3.Keypair.generate(); - await program.rpc.initializeSkipRentExempt({ - accounts: { - data: data.publicKey, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }, - signers: [data], - instructions: [ - SystemProgram.createAccount({ - programId: program.programId, - space: 8 + 16 + 16, - lamports: - await program.provider.connection.getMinimumBalanceForRentExemption( - 39 - ), - fromPubkey: anchor.getProvider().wallet.publicKey, - newAccountPubkey: data.publicKey, - }), - ], - }); - }); - - it("can use rent_exempt to enforce rent exemption", async () => { - const data = anchor.web3.Keypair.generate(); - await program.rpc.initializeSkipRentExempt({ - accounts: { - data: data.publicKey, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }, - signers: [data], - instructions: [ - SystemProgram.createAccount({ - programId: program.programId, - space: 8 + 16 + 16, - lamports: - await program.provider.connection.getMinimumBalanceForRentExemption( - 39 - ), - fromPubkey: anchor.getProvider().wallet.publicKey, - newAccountPubkey: data.publicKey, - }), - ], - }); - - try { - await program.rpc.testEnforceRentExempt({ - accounts: { - data: data.publicKey, - }, - }); - assert.ok(false); - } catch (_err) { - assert.isTrue(_err instanceof AnchorError); - const err: AnchorError = _err; - assert.strictEqual(err.error.errorCode.number, 2005); - assert.strictEqual( - "A rent exemption constraint was violated", - err.error.errorMessage - ); - } - }); - describe("Can validate PDAs derived from other program ids", () => { it("With bumps using create_program_address", async () => { const [firstPDA, firstBump] = diff --git a/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs b/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs index 485782ff..0e4e8430 100644 --- a/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs +++ b/tests/zero-copy/programs/zero-copy/tests/compute_unit_test.rs @@ -38,7 +38,7 @@ async fn update_foo() { let mut pt = ProgramTest::new("zero_copy", zero_copy::id(), None); pt.add_account(foo_pubkey, foo_account); - pt.set_bpf_compute_max_units(3077); + pt.set_compute_max_units(3157); let (mut banks_client, payer, recent_blockhash) = pt.start().await; let client = Client::new_with_options(