From df04d80596bde78cc1b9e0e3103c32cba45521b1 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Thu, 7 Jul 2022 15:16:21 -0500 Subject: [PATCH 01/45] Stopped serializing enums that are not serializable --- lang/syn/src/idl/file.rs | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index 23e813aa52..a1e6c75c3b 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -484,7 +484,30 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result (), + _ => return None, + } + let name = enm.ident.to_string(); let doc = if !no_docs { docs::parse(&enm.attrs) @@ -531,11 +554,11 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result>(); - Ok(IdlTypeDefinition { + Some(Ok(IdlTypeDefinition { name, docs: doc, ty: IdlTypeDefinitionTy::Enum { variants }, - }) + })) })) .collect() } From 67f1e0d41865c35693813ec4eed4801faa46cdb0 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 22 Jul 2022 16:09:13 -0500 Subject: [PATCH 02/45] Removed the seed warning for anchor seeding --- lang/syn/src/idl/pda.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/syn/src/idl/pda.rs b/lang/syn/src/idl/pda.rs index 537e58f592..26e1453172 100644 --- a/lang/syn/src/idl/pda.rs +++ b/lang/syn/src/idl/pda.rs @@ -120,7 +120,7 @@ impl<'a> PdaParser<'a> { } // Unknown type. Please file an issue. _ => { - println!("WARNING: unexpected seed: {:?}", seed); + // println!("WARNING: unexpected seed: {:?}", seed); None } } From ff107c27416f1edd935274031ebcc328192209a7 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Mon, 26 Sep 2022 12:17:14 -0500 Subject: [PATCH 03/45] Upped version to have difference from main-line --- cli/Cargo.toml | 2 +- tests/auction-house | 2 +- tests/cfo/deps/stake | 2 +- tests/cfo/deps/swap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index df99237252..f10cb63322 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.0" +version = "0.25.10" authors = ["armaniferrante "] rust-version = "1.56" edition = "2021" diff --git a/tests/auction-house b/tests/auction-house index 9b0c81e597..63e7bb81be 160000 --- a/tests/auction-house +++ b/tests/auction-house @@ -1 +1 @@ -Subproject commit 9b0c81e5972f2466d47c20f705fc5fd1ca16476c +Subproject commit 63e7bb81beb76f2722245a37c16a7b0b00d6905a diff --git a/tests/cfo/deps/stake b/tests/cfo/deps/stake index fd78344ab5..6a1c128e85 160000 --- a/tests/cfo/deps/stake +++ b/tests/cfo/deps/stake @@ -1 +1 @@ -Subproject commit fd78344ab5f34c36a91bdaf8b9edf2fbd8a93510 +Subproject commit 6a1c128e859b13b39812c0c75d202b2bf9ee1e8c diff --git a/tests/cfo/deps/swap b/tests/cfo/deps/swap index 9c6bd407eb..3da36aaae7 160000 --- a/tests/cfo/deps/swap +++ b/tests/cfo/deps/swap @@ -1 +1 @@ -Subproject commit 9c6bd407eb96ac77f4aef0d4387ca5b122f1c20c +Subproject commit 3da36aaae7af6ce901d68c0280aac34817fe7fd8 From da1397e4e2213fb2a5b45cd68b158600eca21034 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Mon, 30 Jan 2023 20:42:35 -0500 Subject: [PATCH 04/45] add unpacked to tys --- Cargo.lock | 2 +- lang/syn/src/idl/file.rs | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7835a17f3..ef038d9ad8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.0" +version = "0.25.10" dependencies = [ "anchor-client", "anchor-lang", diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index a1e6c75c3b..23a557e22a 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -426,7 +426,9 @@ fn parse_consts(ctx: &CrateContext) -> Vec<&syn::ItemConst> { // Parse all user defined types in the file. fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result> { - ctx.structs() + let mut unpacked_structs = vec![]; + let mut ty_defs = ctx + .structs() .filter_map(|item_strct| { // Only take serializable types let serializable = item_strct.attrs.iter().any(|attr| { @@ -445,6 +447,12 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result (), @@ -478,11 +486,21 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result panic!("Empty structs are allowed."), }; - Some(fields.map(|fields| IdlTypeDefinition { + let struct_res = fields.map(|fields| IdlTypeDefinition { name, docs: doc, ty: IdlTypeDefinitionTy::Struct { fields }, - })) + }); + + if unpackable { + if let Ok(strct) = &struct_res { + let mut unpacked = strct.clone(); + unpacked.name = format!("{}Unpacked", strct.name); + unpacked_structs.push(unpacked); + } + } + + Some(struct_res) }) .chain(ctx.enums().filter_map(|enm| { // Only take serializable types @@ -560,7 +578,9 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result>>()?; + ty_defs.extend(unpacked_structs); + Ok(ty_defs) } // Replace variable array lengths with values From ef398a80477de1506caa120ece4ec08a13103b26 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Mon, 30 Jan 2023 20:42:35 -0500 Subject: [PATCH 05/45] add unpacked to tys --- Cargo.lock | 2 +- lang/syn/src/idl/file.rs | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7835a17f3..ef038d9ad8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.0" +version = "0.25.10" dependencies = [ "anchor-client", "anchor-lang", diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index a1e6c75c3b..23a557e22a 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -426,7 +426,9 @@ fn parse_consts(ctx: &CrateContext) -> Vec<&syn::ItemConst> { // Parse all user defined types in the file. fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result> { - ctx.structs() + let mut unpacked_structs = vec![]; + let mut ty_defs = ctx + .structs() .filter_map(|item_strct| { // Only take serializable types let serializable = item_strct.attrs.iter().any(|attr| { @@ -445,6 +447,12 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result (), @@ -478,11 +486,21 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result panic!("Empty structs are allowed."), }; - Some(fields.map(|fields| IdlTypeDefinition { + let struct_res = fields.map(|fields| IdlTypeDefinition { name, docs: doc, ty: IdlTypeDefinitionTy::Struct { fields }, - })) + }); + + if unpackable { + if let Ok(strct) = &struct_res { + let mut unpacked = strct.clone(); + unpacked.name = format!("{}Unpacked", strct.name); + unpacked_structs.push(unpacked); + } + } + + Some(struct_res) }) .chain(ctx.enums().filter_map(|enm| { // Only take serializable types @@ -560,7 +578,9 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result>>()?; + ty_defs.extend(unpacked_structs); + Ok(ty_defs) } // Replace variable array lengths with values From 064d75f955fd15edc6e649501e699e30e971cddd Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Tue, 31 Jan 2023 14:36:28 -0600 Subject: [PATCH 06/45] Bumped version --- cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f10cb63322..149d7c7649 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.10" +version = "0.25.11" authors = ["armaniferrante "] rust-version = "1.56" edition = "2021" From 745e9e67e1c342645ed32705caad26b330e8c678 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 31 Jan 2023 15:57:14 -0500 Subject: [PATCH 07/45] update lockfile --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index ef038d9ad8..4212e5f0c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.10" +version = "0.25.11" dependencies = [ "anchor-client", "anchor-lang", From de8b8773b8c5d3569aed0f63d4eca863257eae55 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 31 Jan 2023 17:12:01 -0500 Subject: [PATCH 08/45] Updated unpacked struct docs --- lang/syn/src/idl/file.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index 23a557e22a..7c3a136dc1 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -496,6 +496,7 @@ fn parse_ty_defs(ctx: &CrateContext, no_docs: bool) -> Result Date: Thu, 2 Feb 2023 13:24:54 -0500 Subject: [PATCH 09/45] reorder idl stuff and bump version --- Cargo.lock | 2 +- cli/Cargo.toml | 2 +- lang/syn/src/idl/file.rs | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4212e5f0c1..c265b084da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.11" +version = "0.25.12" dependencies = [ "anchor-client", "anchor-lang", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 149d7c7649..bd0a45a28d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.11" +version = "0.25.12" authors = ["armaniferrante "] rust-version = "1.56" edition = "2021" diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index 7c3a136dc1..9f2b2ef9c1 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -186,7 +186,7 @@ pub fn parse( .collect::>() }); - let instructions = p + let mut instructions = p .ixs .iter() .map(|ix| { @@ -224,7 +224,7 @@ pub fn parse( }) .collect::>(); - let events = parse_events(&ctx) + let mut events = parse_events(&ctx) .iter() .map(|e: &&syn::ItemStruct| { let fields = match &e.fields { @@ -279,7 +279,7 @@ pub fn parse( } } - let constants = parse_consts(&ctx) + let mut constants = parse_consts(&ctx) .iter() .map(|c: &&syn::ItemConst| IdlConst { name: c.ident.to_string(), @@ -288,6 +288,13 @@ pub fn parse( }) .collect::>(); + // sort everything by name + instructions.sort_by(|a, b| a.name.cmp(&b.name)); + types.sort_by(|a, b| a.name.cmp(&b.name)); + accounts.sort_by(|a, b| a.name.cmp(&b.name)); + events.sort_by(|a, b| a.name.cmp(&b.name)); + constants.sort_by(|a, b| a.name.cmp(&b.name)); + Ok(Some(Idl { version, name: p.name.to_string(), From d067e08c16f96c23473ab33001c49cb304889620 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:28:49 -0500 Subject: [PATCH 10/45] build script --- .github/workflows/build.yml | 112 ++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..89d5ad6e18 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,112 @@ +# from sugar's build script https://github.com/metaplex-foundation/sugar/blob/7dd0628f42777fb6c04e3f2fb78e332af7337d7a/.github/workflows/build.yml +name: Build and Release + +on: + workflow_dispatch: + pull_request: + types: [opened, reopened] + push: + branches: "**" + tags: + - "v*.*.*" + +jobs: + build: + strategy: + matrix: + os: + - windows-latest + - ubuntu-latest + - macos-latest + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Install libudev-dev on Ubuntu + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install libudev-dev + - name: Install Latest Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + default: true + override: true + + - name: Install rustfmt, clippy and cargo-cache + run: | + rustup component add rustfmt clippy + cargo install cargo-cache + - name: Cache Dependencies + if: runner.os == 'Linux' || runner.os == 'macOS' + uses: actions/cache@v3 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + - name: Build + id: build + shell: bash + run: | + binary_extension="" + if [[ "${RUNNER_OS}" == "Windows" ]]; then + binary_extension=".exe" + binary_path="anchor-windows-latest${binary_extension}" + elif [[ "${RUNNER_OS}" == "macOS" ]]; then + binary_path="anchor-macos-intel-latest" + elif [[ "${RUNNER_OS}" == "Linux" ]]; then + binary_path="anchor-ubuntu-latest" + else + echo "error: unknown OS: ${RUNNER_OS}" + exit 1 + fi + echo "::set-output name=binary_path::${binary_path}" + # clean build for release + if [[ "${GITHUB_REF}" = refs/tags/* ]]; then + cargo clean + fi + cargo build -p anchor-cli --release --locked + cp "target/release/anchor${binary_extension}" "${binary_path}" + strip "${binary_path}" + - name: Test + uses: actions-rs/cargo@v1 + with: + command: test + +# - name: Rustfmt +# uses: actions-rs/cargo@v1 +# with: +# command: fmt +# args: --all -- --check +# +# - name: Clippy +# uses: actions-rs/cargo@v1 +# with: +# command: clippy +# args: -- -D warnings + + - name: Cleanup Dependencies + run: cargo cache clean-unref + + - name: Publish Artifacts + uses: actions/upload-artifact@v3 + if: "!startsWith(github.ref, 'refs/tags/')" + with: + name: ${{ matrix.os }} + path: ${{ steps.build.outputs.binary_path }} + + - name: Release Tags + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: ${{ steps.build.outputs.binary_path }} From f9c1ae34241c78d3e39521b4911d96f62d7adc1b Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:34:01 -0500 Subject: [PATCH 11/45] dont add clippy/rustfmt --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89d5ad6e18..664a1a9b80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,10 +37,10 @@ jobs: default: true override: true - - name: Install rustfmt, clippy and cargo-cache - run: | - rustup component add rustfmt clippy - cargo install cargo-cache +# - name: Install rustfmt, clippy and cargo-cache +# run: | +# rustup component add rustfmt clippy +# cargo install cargo-cache - name: Cache Dependencies if: runner.os == 'Linux' || runner.os == 'macOS' uses: actions/cache@v3 From eb69e70187db2be58886ddd66aa548e53a56876e Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:50:28 -0500 Subject: [PATCH 12/45] no cargo cache --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 664a1a9b80..f5bbac4e50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,8 +95,8 @@ jobs: # command: clippy # args: -- -D warnings - - name: Cleanup Dependencies - run: cargo cache clean-unref +# - name: Cleanup Dependencies +# run: cargo cache clean-unref - name: Publish Artifacts uses: actions/upload-artifact@v3 From 2634769a59b82d2886484245ae5cf1261d02de10 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:40:47 -0500 Subject: [PATCH 13/45] build sbf --- cli/src/lib.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 2b11d36d19..1ac6965808 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -99,7 +99,7 @@ pub enum Command { /// verifiable builds. Only works for debian-based images. #[clap(arg_enum, short, long, default_value = "none")] bootstrap: BootstrapMode, - /// Arguments to pass to the underlying `cargo build-bpf` command + /// Arguments to pass to the underlying `cargo build-sbf` command #[clap( required = false, takes_value = true, @@ -183,7 +183,7 @@ pub enum Command { detach: bool, #[clap(multiple_values = true)] args: Vec, - /// Arguments to pass to the underlying `cargo build-bpf` command. + /// Arguments to pass to the underlying `cargo build-sbf` command. #[clap( required = false, takes_value = true, @@ -1223,7 +1223,8 @@ fn _build_cwd( cargo_args: Vec, ) -> Result<()> { let exit = std::process::Command::new("cargo") - .arg("build-bpf") + .arg("build-sbf") + .args(["--arch", "bpf"]) .args(cargo_args) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) From c086ebb53228c53fc5f2d9c9b2b77120601826e2 Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:42:10 -0500 Subject: [PATCH 14/45] build version --- Cargo.lock | 2 +- cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c265b084da..4dd727c9e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.12" +version = "0.25.13" dependencies = [ "anchor-client", "anchor-lang", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bd0a45a28d..866b2ef019 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.12" +version = "0.25.13" authors = ["armaniferrante "] rust-version = "1.56" edition = "2021" From b58b2da84de0f77cf96c005f32e6e0db89cc2d1f Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 7 Feb 2023 13:47:34 -0500 Subject: [PATCH 15/45] update CI triggers --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5bbac4e50..d5f22cb49d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,10 +3,7 @@ name: Build and Release on: workflow_dispatch: - pull_request: - types: [opened, reopened] push: - branches: "**" tags: - "v*.*.*" From de76db68e466ee40535c9efd645f92ba03fb82cf Mon Sep 17 00:00:00 2001 From: Sammy <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 7 Mar 2023 21:10:04 -0500 Subject: [PATCH 16/45] update cargo_toml version --- Cargo.lock | 4 ++-- cli/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4dd727c9e2..b160824a16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -626,9 +626,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.9.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3596addfb02dcdc06f5252ddda9f3785f9230f5827fb4284645240fa05ad92" +checksum = "363c7cfaa15f101415c4ac9e68706ca4a2277773932828b33f96e59d28c68e62" dependencies = [ "serde", "serde_derive", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 866b2ef019..bc740912f7 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -41,7 +41,7 @@ tar = "0.4.35" reqwest = { version = "0.11.4", features = ["multipart", "blocking"] } tokio = "1.0" pathdiff = "0.2.0" -cargo_toml = "0.9.2" +cargo_toml = "0.10.3" walkdir = "2.3.2" chrono = "0.4.19" portpicker = "0.1.1" From 5c0250a3ee804ac8a0fba9217a56e9c29e904835 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Sat, 29 Apr 2023 14:13:35 -0500 Subject: [PATCH 17/45] Allowed more solana versions and fixed clippy lints --- Cargo.lock | 2955 ++++++++++------- avm/Cargo.toml | 2 +- cli/Cargo.toml | 12 +- cli/src/lib.rs | 44 +- client/Cargo.toml | 8 +- client/example/Cargo.toml | 4 +- client/src/lib.rs | 5 +- clippy.toml | 1 + .../basic-0/programs/basic-0/Cargo.toml | 2 +- .../basic-1/programs/basic-1/Cargo.toml | 2 +- .../basic-2/programs/basic-2/Cargo.toml | 2 +- .../basic-3/programs/puppet-master/Cargo.toml | 2 +- .../basic-3/programs/puppet/Cargo.toml | 2 +- .../basic-4/programs/basic-4/Cargo.toml | 2 +- lang/Cargo.toml | 4 +- lang/attribute/access-control/Cargo.toml | 2 +- lang/attribute/account/Cargo.toml | 4 +- lang/attribute/account/src/id.rs | 4 +- lang/attribute/constant/Cargo.toml | 2 +- lang/attribute/error/Cargo.toml | 2 +- lang/attribute/event/Cargo.toml | 2 +- lang/attribute/interface/Cargo.toml | 2 +- lang/attribute/program/Cargo.toml | 2 +- lang/attribute/state/Cargo.toml | 2 +- lang/derive/accounts/Cargo.toml | 2 +- lang/src/accounts/account.rs | 2 +- lang/src/accounts/cpi_state.rs | 2 +- lang/src/accounts/program_account.rs | 2 +- lang/src/accounts/state.rs | 2 +- lang/src/lib.rs | 3 + lang/src/system_program.rs | 52 +- lang/syn/Cargo.toml | 2 +- lang/syn/src/codegen/program/instruction.rs | 2 +- lang/syn/src/idl/file.rs | 2 +- lang/syn/src/idl/pda.rs | 2 +- lang/syn/src/lib.rs | 2 +- lang/syn/src/parser/accounts/mod.rs | 4 +- lang/syn/src/parser/context.rs | 4 +- lang/syn/src/parser/error.rs | 7 +- spl/Cargo.toml | 8 +- spl/src/associated_token.rs | 1 + spl/src/lib.rs | 2 + spl/src/token.rs | 47 +- tests/auction-house | 2 +- .../programs/bpf-upgradeable-state/Cargo.toml | 2 +- .../programs/cashiers-check/Cargo.toml | 2 +- tests/cfo/deps/stake | 2 +- tests/cfo/deps/swap | 2 +- tests/cfo/programs/cfo/Cargo.toml | 4 +- tests/chat/programs/chat/Cargo.toml | 2 +- tests/composite/programs/composite/Cargo.toml | 2 +- .../programs/custom-coder/Cargo.toml | 2 +- .../programs/native-system/Cargo.toml | 2 +- .../programs/spl-token/Cargo.toml | 2 +- tests/errors/programs/errors/Cargo.toml | 2 +- tests/escrow/programs/escrow/Cargo.toml | 2 +- tests/events/programs/events/Cargo.toml | 2 +- tests/ido-pool/programs/ido-pool/Cargo.toml | 2 +- .../programs/counter-auth/Cargo.toml | 2 +- tests/interface/programs/counter/Cargo.toml | 2 +- tests/lockup/programs/lockup/Cargo.toml | 2 +- tests/lockup/programs/registry/Cargo.toml | 2 +- tests/misc/programs/idl_doc/Cargo.toml | 2 +- tests/misc/programs/misc/Cargo.toml | 4 +- tests/misc/programs/misc2/Cargo.toml | 2 +- tests/misc/programs/shared/Cargo.toml | 2 +- tests/multisig/programs/multisig/Cargo.toml | 2 +- .../programs/pda-derivation/Cargo.toml | 2 +- tests/pyth/programs/pyth/Cargo.toml | 2 +- .../programs/token-proxy/Cargo.toml | 2 +- tests/swap/programs/swap/Cargo.toml | 2 +- .../programs/system-accounts/Cargo.toml | 2 +- tests/sysvars/programs/sysvars/Cargo.toml | 2 +- tests/tictactoe/programs/tictactoe/Cargo.toml | 2 +- tests/typescript/programs/shared/Cargo.toml | 2 +- .../typescript/programs/typescript/Cargo.toml | 2 +- tests/zero-copy/programs/shared/Cargo.toml | 2 +- tests/zero-copy/programs/zero-copy/Cargo.toml | 2 +- tests/zero-copy/programs/zero-cpi/Cargo.toml | 2 +- 79 files changed, 1972 insertions(+), 1321 deletions(-) create mode 100644 clippy.toml diff --git a/Cargo.lock b/Cargo.lock index b160824a16..dc08a35096 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,37 +60,31 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.9", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "alloc-no-stdlib" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ "alloc-no-stdlib", ] @@ -107,10 +101,10 @@ version = "0.25.0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "regex", - "syn 1.0.98", + "syn 1.0.109", ] [[package]] @@ -120,10 +114,10 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "rustversion", - "syn 1.0.98", + "syn 1.0.109", ] [[package]] @@ -131,8 +125,8 @@ name = "anchor-attribute-constant" version = "0.25.0" dependencies = [ "anchor-syn", - "proc-macro2 1.0.40", - "syn 1.0.98", + "proc-macro2 1.0.56", + "syn 1.0.109", ] [[package]] @@ -140,9 +134,9 @@ name = "anchor-attribute-error" version = "0.25.0" dependencies = [ "anchor-syn", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -151,9 +145,9 @@ version = "0.25.0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -163,9 +157,9 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -174,9 +168,9 @@ version = "0.25.0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -185,9 +179,9 @@ version = "0.25.0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -200,15 +194,15 @@ dependencies = [ "anyhow", "cargo_toml", "chrono", - "clap 3.1.6", - "dirs", + "clap 3.2.25", + "dirs 3.0.2", "flate2", "heck 0.3.3", "pathdiff", "portpicker", "rand 0.7.3", "reqwest", - "semver 1.0.6", + "semver 1.0.17", "serde", "serde_json", "shellexpand", @@ -217,7 +211,7 @@ dependencies = [ "solana-faucet", "solana-program", "solana-sdk", - "syn 1.0.98", + "syn 1.0.109", "tar", "tokio", "toml", @@ -245,9 +239,9 @@ version = "0.25.0" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -264,7 +258,7 @@ dependencies = [ "anchor-attribute-state", "anchor-derive-accounts", "arrayref", - "base64 0.13.0", + "base64 0.13.1", "bincode", "borsh", "bytemuck", @@ -291,16 +285,25 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.40", + "proc-macro2 1.0.56", "proc-macro2-diagnostics", - "quote 1.0.15", + "quote 1.0.26", "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.98", + "syn 1.0.109", "thiserror", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -312,15 +315,106 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "ark-bn254" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea691771ebbb28aea556c044e2e5c5227398d840cee0c34d4d20fa8eb2689e8c" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea978406c4b1ca13c2db2373b05cc55429c3575b8b21f1b9ee859aa5b03dd42" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "num-bigint 0.4.3", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint 0.4.3", + "num-traits", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std", + "digest 0.9.0", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "array-bytes" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -328,6 +422,51 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.20", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "assert_matches" version = "1.5.0" @@ -336,9 +475,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" dependencies = [ "brotli", "flate2", @@ -359,13 +498,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.56" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -374,7 +513,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -393,15 +532,21 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64ct" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -429,16 +574,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.3", + "digest 0.10.6", ] [[package]] @@ -453,9 +598,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -485,8 +630,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.40", - "syn 1.0.98", + "proc-macro2 1.0.56", + "syn 1.0.109", ] [[package]] @@ -495,9 +640,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -506,9 +651,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -524,9 +669,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -546,9 +691,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bv" @@ -562,22 +707,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.8.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.0.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -588,38 +733,16 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "caps" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bf7211aad104ce2769ec05efcdfabf85ee84ac92461d142f22cf8badd0e54c" +checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ - "errno", "libc", "thiserror", ] @@ -637,9 +760,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -652,15 +775,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "serde", - "time 0.1.44", + "time 0.1.45", + "wasm-bindgen", "winapi", ] @@ -675,9 +800,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", @@ -700,47 +825,77 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.6" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", "clap_derive", + "clap_lex", "indexmap", - "lazy_static", - "os_str_bytes", + "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.15.0", + "textwrap 0.16.0", ] [[package]] name = "clap_derive" -version = "3.1.4" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", ] [[package]] name = "console" -version = "0.15.0" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "regex", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -755,9 +910,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" dependencies = [ "log", "web-sys", @@ -771,9 +926,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" [[package]] name = "core-foundation" @@ -787,15 +942,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -811,9 +966,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.3" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbfe11fe19ff083c48923cf179540e8cd0535903dc35e178a1fdeeb59aef51f" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -821,9 +976,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -832,26 +987,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", - "memoffset", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", - "lazy_static", ] [[package]] @@ -862,9 +1015,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", @@ -904,16 +1057,90 @@ dependencies = [ ] [[package]] -name = "dashmap" -version = "4.0.2" +name = "cxx" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ - "cfg-if", - "num_cpus", - "rayon", + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2 1.0.56", + "quote 1.0.26", + "scratch", + "syn 2.0.15", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", +] + +[[package]] +name = "darling" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c99d16b88c92aef47e58dadd53e87b4bd234c29934947a6cec8b466300f99b" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ea05d2fcb27b53f7a98faddaf5f2914760330ab7703adfc9df13332b42189f9" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.56", + "quote 1.0.26", + "strsim 0.10.0", + "syn 2.0.15", +] + +[[package]] +name = "darling_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bfb82b62b1b8a2a9808fb4caf844ede819a76cfc23b2827d7f94eefb49551eb" +dependencies = [ + "darling_core", + "quote 1.0.26", + "syn 2.0.15", ] +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + [[package]] name = "der" version = "0.5.1" @@ -923,19 +1150,45 @@ dependencies = [ "const-oid", ] +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-bigint 0.4.3", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derivation-path" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "dialoguer" -version = "0.10.1" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c8ae48e400addc32a8710c8d62d55cb84249a7d58ac4cd959daecfbaddc545" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" dependencies = [ "console", + "shell-words", "tempfile", "zeroize", ] @@ -951,29 +1204,29 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "block-buffer 0.10.2", + "block-buffer 0.10.4", "crypto-common", "subtle", ] [[package]] -name = "dir-diff" -version = "0.3.2" +name = "dirs" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ - "walkdir", + "dirs-sys", ] [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] @@ -990,9 +1243,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -1010,6 +1263,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "dlopen" version = "0.1.8" @@ -1033,11 +1297,17 @@ dependencies = [ "syn 0.15.44", ] +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ed25519" -version = "1.4.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -1065,14 +1335,14 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.2", + "sha2 0.10.6", ] [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -1082,43 +1352,43 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "enum-iterator" -version = "0.7.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.7.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "enum_dispatch" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -1136,16 +1406,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -1156,13 +1426,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1177,15 +1447,15 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1198,35 +1468,33 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "field-offset" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" dependencies = [ - "memoffset", - "rustc_version 0.3.3", + "memoffset 0.8.0", + "rustc_version 0.4.0", ] [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "winapi", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ - "cfg-if", "crc32fast", - "libc", "miniz_oxide", ] @@ -1253,19 +1521,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "futures" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1278,9 +1545,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1288,15 +1555,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1305,38 +1572,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1350,20 +1617,11 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "serde", "typenum", @@ -1395,20 +1653,33 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "goblin" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +dependencies = [ + "log", + "plain", + "scroll", ] [[package]] name = "h2" -version = "0.3.12" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1423,6 +1694,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -1434,9 +1714,12 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "heck" @@ -1449,9 +1732,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1462,6 +1745,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "histogram" version = "0.6.9" @@ -1484,7 +1782,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest 0.10.6", ] [[package]] @@ -1500,9 +1798,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1511,9 +1809,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", @@ -1522,9 +1820,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1540,9 +1838,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1564,9 +1862,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -1588,13 +1886,42 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -1606,7 +1933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core 0.6.3", + "rand_core 0.6.4", "rand_xoshiro", "rayon", "serde", @@ -1615,32 +1942,26 @@ dependencies = [ "version_check", ] -[[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.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown 0.12.1", + "hashbrown 0.12.3", ] [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" dependencies = [ "console", - "lazy_static", "number_prefix", - "regex", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1661,11 +1982,22 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" -version = "2.4.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "itertools" @@ -1678,33 +2010,33 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1726,9 +2058,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "lazy_static" @@ -1738,15 +2073,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -1801,75 +2136,50 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" +name = "link-cplusplus" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ - "cfg-if", + "cc", ] [[package]] -name = "lru" -version = "0.7.7" +name = "linux-raw-sys" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" -dependencies = [ - "hashbrown 0.11.2", -] +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] -name = "lz4" -version = "1.23.3" +name = "lock_api" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edcb94251b1c375c459e5abe9fb0168c1c826c3370172684844f8f3f8d1a885" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ - "libc", - "lz4-sys", + "autocfg", + "scopeguard", ] [[package]] -name = "lz4-sys" -version = "1.9.3" +name = "log" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7be8908e2ed6f31c02db8a9fa962f03e36c53fbfde437363eae3306b85d7e17" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cc", - "libc", + "cfg-if", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.3" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -1883,6 +2193,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "merlin" version = "3.0.0" @@ -1891,15 +2210,15 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.3", + "rand_core 0.6.4", "zeroize", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -1911,68 +2230,62 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.7.14" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", ] [[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" +name = "mpl-token-auth-rules" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" +checksum = "24dcb2b0ec0e9246f6f035e0336ba3359c21f6928dfd90281999e2c8e8ab53eb" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "borsh", + "mpl-token-metadata-context-derive", + "num-derive", + "num-traits", + "rmp-serde", + "serde", + "shank", + "solana-program", + "solana-zk-token-sdk", + "thiserror", ] [[package]] name = "mpl-token-metadata" -version = "1.3.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b06b6275bd3f6444e22b03de7bdf6145ee6d6fa3e14415ddd317473b9ef807" +checksum = "f1e674db8846d4a603454ce9c93233dd8d503d62f2afe1b9e6486ce81e431f89" dependencies = [ "arrayref", "borsh", - "mpl-token-vault", + "mpl-token-auth-rules", + "mpl-token-metadata-context-derive", + "mpl-utils", "num-derive", "num-traits", "shank", @@ -1983,24 +2296,32 @@ dependencies = [ ] [[package]] -name = "mpl-token-vault" +name = "mpl-token-metadata-context-derive" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" +dependencies = [ + "quote 1.0.26", + "syn 1.0.109", +] + +[[package]] +name = "mpl-utils" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade4ef15bc06a6033076c4ff28cba9b42521df5ec61211d6f419415ace2746a" +checksum = "7fc48e64c50dba956acb46eec86d6968ef0401ef37031426da479f1f2b592066" dependencies = [ + "arrayref", "borsh", - "num-derive", - "num-traits", "solana-program", "spl-token", - "thiserror", ] [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2016,24 +2337,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ + "autocfg", "bitflags", - "cc", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", + "pin-utils", ] [[package]] -name = "ntapi" -version = "0.3.7" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "winapi", + "memchr", + "minimal-lexical", ] [[package]] @@ -2042,7 +2365,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" dependencies = [ - "num-bigint", + "num-bigint 0.2.6", "num-complex", "num-integer", "num-iter", @@ -2061,6 +2384,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.2.4" @@ -2077,16 +2411,16 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -2110,58 +2444,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg", - "num-bigint", + "num-bigint 0.2.6", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", -] - -[[package]] -name = "num_threads" -version = "0.1.6" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "libc", + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", ] [[package]] @@ -2170,11 +2495,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + [[package]] name = "once_cell" -version = "1.10.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -2184,18 +2518,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2204,11 +2550,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -2217,84 +2562,38 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] -name = "ouroboros" -version = "0.14.2" +name = "parking_lot" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "aliasable", - "ouroboros_macro", - "stable_deref_trait", + "lock_api", + "parking_lot_core", ] [[package]] -name = "ouroboros_macro" -version = "0.14.2" +name = "parking_lot_core" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.45.0", ] [[package]] -name = "parking_lot" -version = "0.11.2" +name = "paste" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pathdiff" @@ -2313,27 +2612,27 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", + "digest 0.10.6", ] [[package]] name = "pem" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "percentage" @@ -2346,18 +2645,19 @@ dependencies = [ [[package]] name = "pest" -version = "2.1.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -2378,9 +2678,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plain" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "polyval" @@ -2394,6 +2700,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" + [[package]] name = "portpicker" version = "0.1.1" @@ -2405,9 +2717,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" @@ -2420,12 +2732,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -2435,9 +2747,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "version_check", ] @@ -2447,8 +2759,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "version_check", ] @@ -2463,9 +2775,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -2476,9 +2788,9 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "version_check", "yansi", ] @@ -2494,16 +2806,15 @@ dependencies = [ [[package]] name = "quinn" -version = "0.8.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7542006acd6e057ff632307d219954c44048f818898da03113d6c0086bfddd9" +checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", + "rustc-hash", "rustls", "thiserror", "tokio", @@ -2513,17 +2824,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a13a5c0a674c1ce7150c9df7bc4a1e46c2fbbe7c710f56c0dc78b1a810e779e" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" dependencies = [ "bytes", - "fxhash", "rand 0.8.5", "ring", + "rustc-hash", "rustls", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", @@ -2533,16 +2843,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3149f7237331015f1a6adf065c397d1be71e032fcf110ba41da52e7926b882f" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-util", "libc", "quinn-proto", "socket2", - "tokio", "tracing", + "windows-sys 0.42.0", ] [[package]] @@ -2556,11 +2865,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.40", + "proc-macro2 1.0.56", ] [[package]] @@ -2584,7 +2893,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2604,7 +2913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2618,11 +2927,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.9", ] [[package]] @@ -2640,70 +2949,77 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "rcgen" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fa2d386df8533b02184941c76ae2e0d0c1d053f5d43339169d80f21275fc5e" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.11", + "time 0.3.20", "yasna", ] [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.5", - "redox_syscall", + "getrandom 0.2.9", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", @@ -2712,27 +3028,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "remove_dir_all" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc5b3ce5d5ea144bb04ebd093a9e14e9765bcfec866aecda9b6dec43b3d1e24" -dependencies = [ - "winapi", -] +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "async-compression", - "base64 0.13.0", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -2745,15 +3052,15 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "mime_guess", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile 0.3.0", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", @@ -2761,6 +3068,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tokio-util", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -2784,18 +3092,55 @@ dependencies = [ "winapi", ] +[[package]] +name = "rmp" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + [[package]] name = "rpassword" -version = "6.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", - "serde", - "serde_json", "winapi", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2817,14 +3162,37 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.6", + "semver 1.0.17", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.37.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.4" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -2839,49 +3207,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.0", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.0", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safe-transmute" @@ -2900,12 +3250,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -2914,6 +3263,32 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", +] + [[package]] name = "sct" version = "0.7.0" @@ -2926,9 +3301,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -2939,9 +3314,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -2958,9 +3333,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.6" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -2973,38 +3348,38 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -3023,16 +3398,39 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", +] + [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" dependencies = [ "indexmap", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -3060,13 +3458,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.6", ] [[package]] @@ -3084,13 +3482,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.6", ] [[package]] @@ -3107,71 +3505,77 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.1" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" dependencies = [ - "digest 0.10.3", + "digest 0.10.6", "keccak", ] [[package]] name = "shank" -version = "0.0.2" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cfd616747d1ce69f15e62ea30589e393115e4b884d7c1cbceb751b8753e95d" +checksum = "b63e565b5e95ad88ab38f312e89444c749360641c509ef2de0093b49f55974a5" dependencies = [ "shank_macro", ] [[package]] name = "shank_macro" -version = "0.0.2" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a27d3b536acc60a3ff359181d3a912d10b91539f85909447ca7d33ea0a91d56" +checksum = "63927d22a1e8b74bda98cc6e151fcdf178b7abb0dc6c4f81e0bbf5ffe2fc4ec8" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "shank_macro_impl", - "syn 1.0.98", + "syn 1.0.109", ] [[package]] name = "shank_macro_impl" -version = "0.0.2" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7466a15559fd11aeb5fe12a700923f75bb4eaa7bc90962f2bd822708698ab5d" +checksum = "40ce03403df682f80f4dc1efafa87a4d0cb89b03726d0565e6364bdca5b9a441" dependencies = [ "anyhow", - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "serde", - "syn 1.0.98", + "syn 1.0.109", ] +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "shellexpand" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" dependencies = [ - "dirs-next", + "dirs 4.0.0", ] [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.5.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "sized-chunks" @@ -3185,21 +3589,24 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -3207,12 +3614,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e4d449c99aa412aa0ad73df67d5cb2e61f91a2127231e57e81b79cb5e6e6718" +checksum = "b7e4ac2e5e6474d17f19341df43c62b62ee1e362bae9b06bc30223252dd4a362" dependencies = [ "Inflector", - "base64 0.13.0", + "base64 0.13.1", "bincode", "bs58 0.4.0", "bv", @@ -3220,9 +3627,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", - "solana-vote-program", "spl-token", "spl-token-2022", "thiserror", @@ -3231,9 +3638,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f7d39516d390dbf22a7d6aa42bdac07fecc9c0b9c1501cd845c7230fa98aa2e" +checksum = "baac6a0dfc38f64e5e5e178e9eeade05ef1a2c644c95062523c6bc21f19f8866" dependencies = [ "bincode", "bytemuck", @@ -3250,26 +3657,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-bucket-map" -version = "1.10.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef123b23f8c59d3bef0b8d1eb9dc936b98a3a846b0d3b516e6f5a202c6b42a5" -dependencies = [ - "log", - "memmap2", - "modular-bitfield", - "rand 0.7.3", - "solana-measure", - "solana-sdk", - "tempfile", -] - [[package]] name = "solana-clap-utils" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6645eb1fb086062c3d1c0b63865a04ab91106e49d3b55e58c88282335324311c" +checksum = "8f0a43f9bcf2405e50190cf3943046663caae557db9eb71a628f359e3f4f3eea" dependencies = [ "chrono", "clap 2.34.0", @@ -3285,9 +3677,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055a08171cf7c30fde53d1b5c44623c1453ebb54145bf7a193fedc24503035bb" +checksum = "2c79aa0d4d3cef702ca522c1b8dca170eb7137254b6d608f46bcb3a26d6fffd3" dependencies = [ "dirs-next", "lazy_static", @@ -3301,74 +3693,44 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2a11b9182a7e95c1fcd686a2adbff4c19ee7da2fdf5e8f4807ce00814401f9" +checksum = "1fe890559c3d8e29123ed0bfba47d5d714acb1db2e4a9a981c9171960ae01425" dependencies = [ - "async-mutex", "async-trait", - "base64 0.13.0", "bincode", - "bs58 0.4.0", - "bytes", - "clap 2.34.0", - "crossbeam-channel", "enum_dispatch", "futures", "futures-util", "indexmap", "indicatif", - "itertools 0.10.3", - "jsonrpc-core", - "lazy_static", "log", - "lru", "quinn", - "quinn-proto", "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", - "reqwest", - "rustls", - "semver 1.0.6", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-faucet", + "solana-connection-cache", "solana-measure", "solana-metrics", "solana-net-utils", + "solana-pubsub-client", + "solana-quic-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-rpc-client-nonce-utils", "solana-sdk", "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token-2022", + "solana-thin-client", + "solana-tpu-client", + "solana-udp-client", "thiserror", "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", -] - -[[package]] -name = "solana-compute-budget-program" -version = "1.10.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355efb42d58bbc3b1af7f5dd244c9c370c318e35876cea31a4354521d38383d9" -dependencies = [ - "solana-program-runtime", - "solana-sdk", ] [[package]] name = "solana-config-program" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e456899b60ccc04cba02a1b2a0bb00cc92a1e60b04ed7d16cbfb2cb1169533c" +checksum = "ebb520c573b28060cadd8ae0fa6ae116cf74dac01078bc437d8b3e3ab00efd22" dependencies = [ "bincode", "chrono", @@ -3379,15 +3741,36 @@ dependencies = [ ] [[package]] -name = "solana-faucet" -version = "1.10.29" +name = "solana-connection-cache" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a72947370668638d3193227d020e8204b291f72dfd72caf276eecb2f7a9591" +checksum = "5c913dfcaf847cecd8866e4aeaa440b34c8a5dae6c1c90b7a8cb3265ff9fc775" dependencies = [ + "async-trait", "bincode", - "byteorder", - "clap 2.34.0", - "crossbeam-channel", + "futures-util", + "indexmap", + "log", + "rand 0.7.3", + "rayon", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-sdk", + "thiserror", + "tokio", +] + +[[package]] +name = "solana-faucet" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90180632e0528cd46e0ebfaf98977b24fc4593422be9b200e0dfaf97ee09cc7" +dependencies = [ + "bincode", + "byteorder", + "clap 2.34.0", + "crossbeam-channel", "log", "serde", "serde_derive", @@ -3404,43 +3787,55 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4575674b138156108ea7ee855633b28b72d8cd3890245e0847bfdade3797dc" +checksum = "48f7051cccdf891ac2603cdd295eb651529fe2b678b6b3af60b82dec9a9b3b06" dependencies = [ + "ahash", + "blake3", + "block-buffer 0.9.0", "bs58 0.4.0", "bv", + "byteorder", + "cc", + "either", "generic-array", + "getrandom 0.1.16", + "hashbrown 0.12.3", "im", "lazy_static", "log", "memmap2", + "once_cell", + "rand_core 0.6.4", "rustc_version 0.4.0", "serde", "serde_bytes", "serde_derive", - "sha2 0.10.2", + "serde_json", + "sha2 0.10.6", "solana-frozen-abi-macro", + "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec433ed9f8e7dd62edb6ebe13be01a5e0ec04734305836906709339428c7eaf" +checksum = "06395428329810ade1d2518a7e75d8a6f02d01fe548aabb60ff1ba6a2eaebbe5" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "rustc_version 0.4.0", - "syn 1.0.98", + "syn 1.0.109", ] [[package]] name = "solana-logger" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248781d011bdad67c36e4dcd5f83d095b8fd865dbccb5c31a0c01b2a8710269f" +checksum = "170714ca3612e4df75f57c2c14c8ab74654b3b66f668986aeed456cedcf24446" dependencies = [ "env_logger", "lazy_static", @@ -3449,9 +3844,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc22eb95a690580f3a4af2ec170191365d0f8776e9c75fe731be9e5c76b7047e" +checksum = "52b03528be5a0fbbe4c06a4e1758d155363b51f7c782435b1eb1d4804ab124e3" dependencies = [ "log", "solana-sdk", @@ -3459,9 +3854,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95f40388091b7abb5cfe7f25910443cf1ce4e60603a29c7e8539036af6b3f9c" +checksum = "dc5ff9cbbe50e9918576ff46b4e38d9a946c33fc442982ce7ff397a3b851922a" dependencies = [ "crossbeam-channel", "gethostname", @@ -3473,12 +3868,12 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d94eaf325096b4b8b14b206b510759e65426f9b6b602f62c3cacc41bceaa823" +checksum = "26f35dff5b963ec471514e89bd99c7ac43545756221c99b63c2229cf5f37ebb2" dependencies = [ "bincode", - "clap 2.34.0", + "clap 3.2.25", "crossbeam-channel", "log", "nix", @@ -3495,9 +3890,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562e0219210de30e3b08e0d93ea8b77c875683aac1ecddc31c7bc17608bfff42" +checksum = "33d630964a18fb466d79c3f5e191f37083b52b584a3f596e17f4bd41a145254d" dependencies = [ "ahash", "bincode", @@ -3522,11 +3917,15 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326eeba5a7ddce915ae3aec9eed8ff017f68baf6149f5b075b25e6834c16eae" +checksum = "1ae9f0fa7db3a4e90fa0df2723ac8cbc042e579cf109cd0380bc5a8c88bed924" dependencies = [ - "base64 0.13.0", + "ark-bn254", + "ark-ec", + "ark-ff", + "array-bytes", + "base64 0.13.1", "bincode", "bitflags", "blake3", @@ -3535,62 +3934,127 @@ dependencies = [ "bs58 0.4.0", "bv", "bytemuck", + "cc", "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.1.16", - "itertools 0.10.3", + "getrandom 0.2.9", + "itertools 0.10.5", "js-sys", "lazy_static", + "libc", "libsecp256k1", "log", + "memoffset 0.8.0", + "num-bigint 0.4.3", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "rand 0.7.3", + "rand_chacha 0.2.2", "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", - "sha2 0.10.2", - "sha3 0.10.1", + "serde_json", + "sha2 0.10.6", + "sha3 0.10.7", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", "thiserror", + "tiny-bip39", "wasm-bindgen", + "zeroize", ] [[package]] name = "solana-program-runtime" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1886fa2f172b4812e235e72751bbb83bd661b686cadd3321c1d04c156d8fe392" +checksum = "bbb3250dc9a0abc87693437ae0bb3eb02603396dcf7698c06f77c33b2c0291ca" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bincode", + "eager", "enum-iterator", - "itertools 0.10.3", + "itertools 0.10.5", "libc", "libloading", "log", "num-derive", "num-traits", + "rand 0.7.3", "rustc_version 0.4.0", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-measure", + "solana-metrics", + "solana-sdk", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-pubsub-client" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e441892b9a00fdceebb0e7eee3226f2f5985a15d081aab1924a298f24cdadb2" +dependencies = [ + "crossbeam-channel", + "futures-util", + "log", + "reqwest", + "semver 1.0.17", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url", +] + +[[package]] +name = "solana-quic-client" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d19f3bd22bd8cef3bd7007e878f8ee1e9534a2b2ad99abc1ac05ed3d9f9bed" +dependencies = [ + "async-mutex", + "async-trait", + "futures", + "itertools 0.10.5", + "lazy_static", + "log", + "quinn", + "quinn-proto", + "quinn-udp", + "rustls", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-rpc-client-api", "solana-sdk", + "solana-streamer", + "solana-tpu-client", "thiserror", + "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2f2a1b6b18d9311064cbf92fea851fc0c9475ec7ff43b13993cb6afc38e1db" +checksum = "30893a53deeb0a3e32451f4f7cb063484e1504a06b127c4b40c223ea90093d7b" dependencies = [ "lazy_static", "num_cpus", @@ -3598,90 +4062,92 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9192ad1466c72777d14b779b2361c89576384964eaa9897fde5d817fca5ca07f" +checksum = "970f142fbf6bda164847f60977ad56adde32cafb7c798d2e005110410754aa85" dependencies = [ "console", "dialoguer", "log", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "qstring", - "semver 1.0.6", + "semver 1.0.17", "solana-sdk", "thiserror", "uriparse", ] [[package]] -name = "solana-runtime" -version = "1.10.29" +name = "solana-rpc-client" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117e3d4bf099e9f2e38862a9dc29f5e8f7192fe8d4cc7c314ccc1e1514ed7b3" +checksum = "075485c8ce9300df10b67f01bb9e9ecb79c4c96c58e4b8aacac20e63c6144149" dependencies = [ - "arrayref", + "async-trait", + "base64 0.13.1", "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap", - "dir-diff", - "flate2", - "fnv", - "im", - "index_list", - "itertools 0.10.3", - "lazy_static", + "bs58 0.4.0", + "indicatif", "log", - "lz4", - "memmap2", - "num-derive", - "num-traits", - "num_cpus", - "ouroboros", - "rand 0.7.3", - "rayon", - "regex", - "rustc_version 0.4.0", + "reqwest", + "semver 1.0.17", "serde", "serde_derive", - "solana-address-lookup-table-program", - "solana-bucket-map", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-rayon-threadlimit", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", "solana-sdk", - "solana-stake-program", + "solana-transaction-status", + "solana-version", "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk 1.10.29", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", + "tokio", +] + +[[package]] +name = "solana-rpc-client-api" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0623112b87c9e65ef00538e27203b6129518d40376a4aa2ddc4fae5bf78a8a2c" +dependencies = [ + "base64 0.13.1", + "bs58 0.4.0", + "jsonrpc-core", + "reqwest", + "semver 1.0.17", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "solana-rpc-client-nonce-utils" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a70673c11ff5d831c4e569b41aeb86c0e9c68dba79515b7c6f42b8f842be76fe" +dependencies = [ + "clap 2.34.0", + "solana-clap-utils", + "solana-rpc-client", + "solana-sdk", "thiserror", - "zstd", ] [[package]] name = "solana-sdk" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815e81b6aac0cbd511e4ac9e425dc19dfd5705fcf7eaaa619f99a56feac81c71" +checksum = "bbefda9f9bda78fd9d91ae21c38d9693e94d5979838fb69b70c6addb8dab953f" dependencies = [ "assert_matches", - "base64 0.13.0", + "base64 0.13.1", "bincode", "bitflags", "borsh", @@ -3690,12 +4156,12 @@ dependencies = [ "byteorder", "chrono", "derivation-path", - "digest 0.10.3", + "digest 0.10.6", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools 0.10.3", + "itertools 0.10.5", "js-sys", "lazy_static", "libsecp256k1", @@ -3703,7 +4169,8 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.10.1", + "num_enum", + "pbkdf2 0.11.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", @@ -3713,8 +4180,9 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.2", - "sha3 0.10.1", + "serde_with", + "sha2 0.10.6", + "sha3 0.10.7", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -3727,50 +4195,28 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d94af92e7bca7d55a2e21b55a882545bd9709e4056de4a97b1e1fdc8687ccd" +checksum = "f809319358d5da7c3a0ac08ebf4d87b21170d928dbb7260254e8f3061f7f9e0e" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", "rustversion", - "syn 1.0.98", -] - -[[package]] -name = "solana-stake-program" -version = "1.10.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeebdde9e1d1fcddbe302ee36e48505d766b979df27c05181553a7022adc412a" -dependencies = [ - "bincode", - "log", - "num-derive", - "num-traits", - "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", + "syn 1.0.109", ] [[package]] name = "solana-streamer" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3fc65fde637d4db546f16c15e3efa0d9fb06d0b8ddd2861371e5352b2249306" +checksum = "ddd5b3dad02879b083b7218b9f9596d97cee8deda2b625bff67db95d8920f5f7" dependencies = [ "crossbeam-channel", "futures-util", "histogram", - "itertools 0.10.3", + "indexmap", + "itertools 0.10.5", "libc", "log", "nix", @@ -3778,6 +4224,8 @@ dependencies = [ "percentage", "pkcs8", "quinn", + "quinn-proto", + "quinn-udp", "rand 0.7.3", "rcgen", "rustls", @@ -3786,16 +4234,59 @@ dependencies = [ "solana-sdk", "thiserror", "tokio", + "x509-parser", +] + +[[package]] +name = "solana-thin-client" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16bdd6347caf841a007952c748cd35c3ec8395aa3816ac59b4a9b4c102237de" +dependencies = [ + "bincode", + "log", + "rayon", + "solana-connection-cache", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", + "solana-tpu-client", +] + +[[package]] +name = "solana-tpu-client" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50a7dfa7a85ba000656d91c8847b61f8fa9b8067443449fab8e4c35fe01dee5c" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap", + "indicatif", + "log", + "rand 0.7.3", + "rayon", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-pubsub-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", ] [[package]] name = "solana-transaction-status" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3157353232170f2b0b557ed5738a5b0f60324d55c2220630c17f44926c66b3a" +checksum = "b803e356fc2de0074866a6da007e721c950e754747e761a263b7f9e4c17edefa" dependencies = [ "Inflector", - "base64 0.13.0", + "base64 0.13.1", "bincode", "borsh", "bs58 0.4.0", @@ -3805,11 +4296,8 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-measure", - "solana-metrics", - "solana-runtime", + "solana-address-lookup-table-program", "solana-sdk", - "solana-vote-program", "spl-associated-token-account", "spl-memo", "spl-token", @@ -3817,15 +4305,31 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-udp-client" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b0d7efeb2cb7dafbf3b085c895e440b8947fe5def6bdad17ebae9badfdecb0" +dependencies = [ + "async-trait", + "solana-connection-cache", + "solana-net-utils", + "solana-sdk", + "solana-streamer", + "solana-tpu-client", + "thiserror", + "tokio", +] + [[package]] name = "solana-version" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3340187183a6c4b0c4c0897e62a8e424bea263b72368adf4a0fc49b02dc199" +checksum = "2c3df7b4a4dc0a39da78d790845089a8d112fcd6d2d003ae93830387a564cfc5" dependencies = [ "log", "rustc_version 0.4.0", - "semver 1.0.6", + "semver 1.0.17", "serde", "serde_derive", "solana-frozen-abi", @@ -3835,9 +4339,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.10.29" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc5ae03749431a80f754d5950249296b27915912fbc76f29be489d50a235e62" +checksum = "2439b8c68f000f8c3713eceabb5cabc8528d276e5bc971c694d4103d4be958ff" dependencies = [ "bincode", "log", @@ -3849,41 +4353,28 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", + "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", ] -[[package]] -name = "solana-zk-token-proof-program" -version = "1.10.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10936892fbed52cac2885c2294483296a7010452f178159f49bee89b94f9cc73" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk 1.10.29", -] - [[package]] name = "solana-zk-token-sdk" -version = "0.8.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b149253f9ed1afb68b3161b53b62b637d0dd7a3b328dffdc8bb5878d48358e" +checksum = "9a290aa32014e007b03f952d5b784433d95636c65a3fb08d19dc5658a450941c" dependencies = [ "aes-gcm-siv", "arrayref", - "base64 0.13.0", + "base64 0.13.1", "bincode", "bytemuck", "byteorder", - "cipher 0.3.0", + "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", + "itertools 0.10.5", "lazy_static", "merlin", "num-derive", @@ -3900,33 +4391,22 @@ dependencies = [ ] [[package]] -name = "solana-zk-token-sdk" -version = "1.10.29" +name = "solana_rbpf" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a096f1eadbab6d9406763ad672a763fcaad81ab4c7185605976a39710d4b34e" +checksum = "a4e9e5085099858adba23d0a0b5298da8803f89999cb567ecafab9c916cdf53d" dependencies = [ - "aes-gcm-siv", - "arrayref", - "base64 0.13.0", - "bincode", - "bytemuck", "byteorder", - "cipher 0.4.3", - "curve25519-dalek", - "getrandom 0.1.16", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", + "combine", + "goblin", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "scroll", "thiserror", - "zeroize", + "winapi", ] [[package]] @@ -3947,13 +4427,18 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b013067447a1396303ddfc294f36e3d260a32f8a16c501c295bcdc7de39b490" +checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6" dependencies = [ + "assert_matches", "borsh", + "num-derive", + "num-traits", "solana-program", "spl-token", + "spl-token-2022", + "thiserror", ] [[package]] @@ -3967,11 +4452,12 @@ dependencies = [ [[package]] name = "spl-token" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc67166ef99d10c18cb5e9c208901e6d8255c6513bb1f877977eba48e6cc4fb" +checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", + "bytemuck", "num-derive", "num-traits", "num_enum", @@ -3981,9 +4467,9 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce48c69350134e8678de5c0956a531b7de586b28eebdddc03211ceec0660983" +checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8" dependencies = [ "arrayref", "bytemuck", @@ -3991,18 +4477,12 @@ dependencies = [ "num-traits", "num_enum", "solana-program", - "solana-zk-token-sdk 0.8.1", + "solana-zk-token-sdk", "spl-memo", "spl-token", "thiserror", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -4021,40 +4501,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" -dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.40", - "quote 1.0.15", - "rustversion", - "syn 1.0.98", -] - [[package]] name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - [[package]] name = "syn" version = "0.15.44" @@ -4068,12 +4520,23 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.98" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", + "proc-macro2 1.0.56", + "quote 1.0.26", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2 1.0.56", + "quote 1.0.26", "unicode-ident", ] @@ -4083,10 +4546,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", - "unicode-xid 0.2.2", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", + "unicode-xid 0.2.4", ] [[package]] @@ -4102,37 +4565,26 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -4144,35 +4596,35 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -4181,12 +4633,29 @@ dependencies = [ [[package]] name = "time" -version = "0.3.11" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "libc", - "num_threads", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +dependencies = [ + "time-core", ] [[package]] @@ -4210,55 +4679,54 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.14.1" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "tokio-native-tls" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", "tokio", @@ -4266,9 +4734,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -4277,9 +4745,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -4288,9 +4756,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", @@ -4304,40 +4772,57 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" dependencies = [ - "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4345,37 +4830,37 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] name = "tracing-core" -version = "0.1.23" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -4393,15 +4878,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicase" @@ -4414,36 +4899,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" @@ -4453,9 +4938,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -4467,6 +4952,30 @@ dependencies = [ "subtle", ] +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + +[[package]] +name = "unsize" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fa7a7a734c1a5664a662ddcea0b6c9472a21da8888c957c7f1eaa09dba7a939" +dependencies = [ + "autocfg", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -4475,9 +4984,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "uriparse" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e515b1ada404168e145ac55afba3c42f04cf972201a8552d42e2abb17c1b7221" +checksum = "0200d0fc04d809396c2ad43f3c95da3582a2556eba8d453c1087f4120ee352ff" dependencies = [ "fnv", "lazy_static", @@ -4485,13 +4994,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -4519,14 +5027,19 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -4552,11 +5065,17 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4564,24 +5083,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", - "lazy_static", "log", - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "once_cell", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -4591,38 +5110,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.15", + "quote 1.0.26", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4640,9 +5159,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -4678,48 +5197,170 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -4732,44 +5373,54 @@ dependencies = [ [[package]] name = "without-alloc" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e34736feff52a0b3e5680927e947a4d8fac1f0b80dc8120b080dd8de24d75e2" +checksum = "375db0478b203b950ef10d1cce23cdbe5f30c2454fd9e7673ff56656df23adbb" dependencies = [ "alloc-traits", + "unsize", ] [[package]] -name = "xattr" -version = "0.2.2" +name = "x509-parser" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "libc", + "asn1-rs", + "base64 0.13.1", + "data-encoding", + "der-parser", + "lazy_static", + "nom", + "oid-registry", + "rusticata-macros", + "thiserror", + "time 0.3.20", ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ - "linked-hash-map", + "libc", ] [[package]] name = "yansi" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.11", + "time 0.3.20", ] [[package]] @@ -4783,14 +5434,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.15", - "syn 1.0.98", - "synstructure", + "proc-macro2 1.0.56", + "quote 1.0.26", + "syn 2.0.15", ] [[package]] @@ -4814,10 +5464,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/avm/Cargo.toml b/avm/Cargo.toml index 0947fb8a6a..c460b49338 100644 --- a/avm/Cargo.toml +++ b/avm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm" version = "0.25.0" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [[bin]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bc740912f7..7173fab779 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-cli" version = "0.25.13" authors = ["armaniferrante "] -rust-version = "1.56" +rust-version = "1.59" edition = "2021" repository = "https://github.com/coral-xyz/anchor" description = "Anchor CLI" @@ -28,11 +28,11 @@ shellexpand = "2.1.0" toml = "0.5.8" semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } -solana-sdk = "~1.10.29" -solana-program = "~1.10.29" -solana-client = "~1.10.29" -solana-cli-config = "~1.10.29" -solana-faucet = "~1.10.29" +solana-sdk = "1.10.29" +solana-program = "1.10.29" +solana-client = "1.10.29" +solana-cli-config = "1.10.29" +solana-faucet = "1.10.29" dirs = "3.0" heck = "0.3.1" flate2 = "1.0.19" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 1ac6965808..c7667b2146 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -571,7 +571,7 @@ fn init(cfg_override: &ConfigOverride, name: String, javascript: bool, no_git: b let mut package_json = File::create("package.json")?; package_json.write_all(template::package_json().as_bytes())?; - let mut mocha = File::create(&format!("tests/{}.js", name))?; + let mut mocha = File::create(format!("tests/{}.js", name))?; mocha.write_all(template::mocha(&name).as_bytes())?; let mut deploy = File::create("migrations/deploy.js")?; @@ -587,7 +587,7 @@ fn init(cfg_override: &ConfigOverride, name: String, javascript: bool, no_git: b let mut deploy = File::create("migrations/deploy.ts")?; deploy.write_all(template::ts_deploy_script().as_bytes())?; - let mut mocha = File::create(&format!("tests/{}.ts", name))?; + let mut mocha = File::create(format!("tests/{}.ts", name))?; mocha.write_all(template::ts_mocha(&name).as_bytes())?; } @@ -633,7 +633,7 @@ fn new(cfg_override: &ConfigOverride, name: String) -> Result<()> { println!("Unable to make new program"); } Some(parent) => { - std::env::set_current_dir(&parent)?; + std::env::set_current_dir(parent)?; new_program(&name)?; println!("Created new program."); } @@ -644,13 +644,13 @@ fn new(cfg_override: &ConfigOverride, name: String) -> Result<()> { // Creates a new program crate in the current directory with `name`. fn new_program(name: &str) -> Result<()> { - fs::create_dir(&format!("programs/{}", name))?; - fs::create_dir(&format!("programs/{}/src/", name))?; - let mut cargo_toml = File::create(&format!("programs/{}/Cargo.toml", name))?; + fs::create_dir(format!("programs/{}", name))?; + fs::create_dir(format!("programs/{}/src/", name))?; + let mut cargo_toml = File::create(format!("programs/{}/Cargo.toml", name))?; cargo_toml.write_all(template::cargo_toml(name).as_bytes())?; - let mut xargo_toml = File::create(&format!("programs/{}/Xargo.toml", name))?; + let mut xargo_toml = File::create(format!("programs/{}/Xargo.toml", name))?; xargo_toml.write_all(template::xargo_toml().as_bytes())?; - let mut lib_rs = File::create(&format!("programs/{}/src/lib.rs", name))?; + let mut lib_rs = File::create(format!("programs/{}/src/lib.rs", name))?; lib_rs.write_all(template::lib_rs(name).as_bytes())?; Ok(()) } @@ -900,7 +900,7 @@ fn build_cwd( ) -> Result<()> { match cargo_toml.parent() { None => return Err(anyhow!("Unable to find parent")), - Some(p) => std::env::set_current_dir(&p)?, + Some(p) => std::env::set_current_dir(p)?, }; match build_config.verifiable { false => _build_cwd(cfg, idl_out, idl_ts_out, skip_lint, cargo_args), @@ -1012,7 +1012,7 @@ fn docker_build( let target_dir = workdir.join("docker-target"); println!("Run docker image"); let exit = std::process::Command::new("docker") - .args(&[ + .args([ "run", "-it", "-d", @@ -1124,7 +1124,7 @@ fn docker_build_bpf( // Execute the build. let exit = std::process::Command::new("docker") - .args(&[ + .args([ "exec", "--env", "PATH=/root/.local/share/solana/install/active_release/bin:/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", @@ -1167,7 +1167,7 @@ fn docker_build_bpf( bin_path.as_path().to_str().unwrap() ); let exit = std::process::Command::new("docker") - .args(&["cp", &bin_artifact, &out_file]) + .args(["cp", &bin_artifact, &out_file]) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) .output() @@ -1189,7 +1189,7 @@ fn docker_cleanup(container_name: &str, target_dir: &Path) -> Result<()> { // Remove the docker image. println!("Removing the docker container"); let exit = std::process::Command::new("docker") - .args(&["rm", "-f", container_name]) + .args(["rm", "-f", container_name]) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) .output() @@ -1302,7 +1302,7 @@ fn verify( cargo_args, false, )?; - std::env::set_current_dir(&cur_dir)?; + std::env::set_current_dir(cur_dir)?; // Verify binary. let binary_name = cargo.lib_name()?; @@ -1354,7 +1354,7 @@ fn cd_member(cfg_override: &ConfigOverride, program_name: &str) -> Result<()> { return Ok(()); } } - return Err(anyhow!("{} is not part of the workspace", program_name,)); + Err(anyhow!("{} is not part of the workspace", program_name,)) } pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result { @@ -1385,6 +1385,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result< )? .value .map_or(Err(anyhow!("Account not found")), Ok)?; + #[allow(deprecated)] let bin = account.data [UpgradeableLoaderState::programdata_data_offset().unwrap_or(0)..] .to_vec(); @@ -1404,6 +1405,7 @@ pub fn verify_bin(program_id: Pubkey, bin_path: &Path, cluster: &str) -> Result< } } UpgradeableLoaderState::Buffer { .. } => { + #[allow(deprecated)] let offset = UpgradeableLoaderState::buffer_data_offset().unwrap_or(0); ( account.data[offset..].to_vec(), @@ -2346,10 +2348,10 @@ fn test_validator_file_paths(test_validator: &Option) -> (String, std::process::exit(1); } if Path::new(&ledger_directory).exists() { - fs::remove_dir_all(&ledger_directory).unwrap(); + fs::remove_dir_all(ledger_directory).unwrap(); } - fs::create_dir_all(&ledger_directory).unwrap(); + fs::create_dir_all(ledger_directory).unwrap(); ( ledger_directory.to_string(), @@ -2572,7 +2574,7 @@ fn create_idl_buffer( // Creates the new buffer account with the system program. let create_account_ix = { - let space = 8 + 32 + 4 + serialize_idl(idl)?.len() as usize; + let space = 8 + 32 + 4 + serialize_idl(idl)?.len(); let lamports = client.get_minimum_balance_for_rent_exemption(space)?; solana_sdk::system_instruction::create_account( &keypair.pubkey(), @@ -2703,7 +2705,7 @@ fn set_workspace_dir_or_exit() { println!("Unable to make new program"); } Some(parent) => { - if std::env::set_current_dir(&parent).is_err() { + if std::env::set_current_dir(parent).is_err() { println!("Not in anchor workspace."); std::process::exit(1); } @@ -2798,7 +2800,7 @@ fn shell(cfg_override: &ConfigOverride) -> Result<()> { let url = cluster_url(cfg, &cfg.test_validator); let js_code = template::node_shell(&url, &cfg.provider.wallet.to_string(), programs)?; let mut child = std::process::Command::new("node") - .args(&["-e", &js_code, "-i", "--experimental-repl-await"]) + .args(["-e", &js_code, "-i", "--experimental-repl-await"]) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) .spawn() @@ -2994,7 +2996,7 @@ fn publish( }); let client = Client::new(); let resp = client - .post(&format!("{}/api/v0/build", cfg.registry.url)) + .post(format!("{}/api/v0/build", cfg.registry.url)) .bearer_auth(token) .multipart(form) .send()?; diff --git a/client/Cargo.toml b/client/Cargo.toml index 5664a50c9c..0f09e65c45 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-client" version = "0.25.0" authors = ["Serum Foundation "] -rust-version = "1.56" +rust-version = "1.59" edition = "2021" license = "Apache-2.0" description = "Rust client for Anchor programs" @@ -15,8 +15,8 @@ anchor-lang = { path = "../lang", version = "0.25.0" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } -solana-client = "~1.10.29" -solana-sdk = "~1.10.29" -solana-account-decoder = "~1.10.29" +solana-client = "1.10.29" +solana-sdk = "1.10.29" +solana-account-decoder = "1.10.29" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 087a788c92..3ec1a843da 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -2,7 +2,7 @@ name = "example" version = "0.1.0" authors = ["Armani Ferrante "] -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [workspace] @@ -17,4 +17,4 @@ shellexpand = "2.1.0" anyhow = "1.0.32" rand = "0.7.3" clap = { version = "3.0.0-rc.0", features = ["derive"] } -solana-sdk = "~1.10.29" +solana-sdk = "1.10.29" diff --git a/client/src/lib.rs b/client/src/lib.rs index 5bbf862aa1..3b155abbf1 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::result_large_err)] + //! `anchor_client` provides an RPC client to send transactions and fetch //! deserialized accounts from Solana programs written in `anchor_lang`. @@ -155,6 +157,7 @@ impl Program { &self, filters: Vec, ) -> Result, ClientError> { + #[allow(deprecated)] let account_type_filter = RpcFilterType::Memcmp(Memcmp { offset: 0, bytes: MemcmpEncodedBytes::Base58(bs58::encode(T::discriminator()).into_string()), @@ -285,7 +288,7 @@ fn handle_program_log( .strip_prefix(PROGRAM_LOG) .or_else(|| l.strip_prefix(PROGRAM_DATA)) { - let borsh_bytes = match anchor_lang::__private::base64::decode(&log) { + let borsh_bytes = match anchor_lang::__private::base64::decode(log) { Ok(borsh_bytes) => borsh_bytes, _ => { #[cfg(feature = "debug")] diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 0000000000..abe19b3a00 --- /dev/null +++ b/clippy.toml @@ -0,0 +1 @@ +msrv = "1.59" diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml index ba1e97aba0..fff101680f 100644 --- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml +++ b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-0" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml index ab9b05c87a..f6b91f1689 100644 --- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml +++ b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-1" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml index 59426513d2..f25afb8a8f 100644 --- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml +++ b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml index 833bb70fca..cbdc18a5e0 100644 --- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml @@ -2,7 +2,7 @@ name = "puppet-master" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml index 998dbbd21c..b4d4d11992 100644 --- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet/Cargo.toml @@ -2,7 +2,7 @@ name = "puppet" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml index 90a71f7f49..1d971632d4 100644 --- a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml +++ b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-4" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index a0a1836012..a0a18525e6 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -3,7 +3,7 @@ name = "anchor-lang" version = "0.25.0" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" license = "Apache-2.0" description = "Solana Sealevel eDSL" @@ -39,6 +39,6 @@ arrayref = "0.3.6" base64 = "0.13.0" borsh = "0.9" bytemuck = "1.4.0" -solana-program = "~1.10.29" +solana-program = "1.10.29" thiserror = "1.0.20" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 4dc80d2fca..7bd124aa77 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for instruction access control" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 91ed572eb8..a813e37608 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an account" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] @@ -21,4 +21,4 @@ syn = { version = "1.0.60", features = ["full"] } anyhow = "1.0.32" anchor-syn = { path = "../../syn", version = "0.25.0", features = ["hash"] } rustversion = "1.0.3" -bs58 = "0.4.0" \ No newline at end of file +bs58 = "0.4.0" diff --git a/lang/attribute/account/src/id.rs b/lang/attribute/account/src/id.rs index 83d87abd71..993591bf0a 100644 --- a/lang/attribute/account/src/id.rs +++ b/lang/attribute/account/src/id.rs @@ -214,10 +214,10 @@ fn parse_pubkey( ) -> Result { let id_vec = bs58::decode(id_literal.value()) .into_vec() - .map_err(|_| syn::Error::new_spanned(&id_literal, "failed to decode base58 string"))?; + .map_err(|_| syn::Error::new_spanned(id_literal, "failed to decode base58 string"))?; let id_array = <[u8; 32]>::try_from(<&[u8]>::clone(&&id_vec[..])).map_err(|_| { syn::Error::new_spanned( - &id_literal, + id_literal, format!("pubkey array is not 32 bytes long: len={}", id_vec.len()), ) })?; diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 120a989e3c..51dc782967 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating constant types" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index bb345086a5..b2fc8854ef 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating error types" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 72c277d472..0eb45279dc 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an event" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 4ec85bfbda..cafb3d1ba7 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program interface trait" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 6e549976d9..a5100e86c9 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining a program" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 48fc3bf6a1..b1372b1524 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program state struct" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 4e07d49a1b..efffc6105d 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor Derive macro for accounts" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/lang/src/accounts/account.rs b/lang/src/accounts/account.rs index 9e53452cd6..cb0b9afb19 100644 --- a/lang/src/accounts/account.rs +++ b/lang/src/accounts/account.rs @@ -404,7 +404,7 @@ impl<'a, T: AccountSerialize + AccountDeserialize + Owner + Clone> Deref for Acc type Target = T; fn deref(&self) -> &Self::Target { - &(*self).account + &self.account } } diff --git a/lang/src/accounts/cpi_state.rs b/lang/src/accounts/cpi_state.rs index 42150d2c89..79be7b90c1 100644 --- a/lang/src/accounts/cpi_state.rs +++ b/lang/src/accounts/cpi_state.rs @@ -124,7 +124,7 @@ impl<'info, T: AccountSerialize + AccountDeserialize + Clone> Deref for CpiState type Target = T; fn deref(&self) -> &Self::Target { - &(*self.inner).account + &self.inner.account } } diff --git a/lang/src/accounts/program_account.rs b/lang/src/accounts/program_account.rs index db6baffc72..a36083254d 100644 --- a/lang/src/accounts/program_account.rs +++ b/lang/src/accounts/program_account.rs @@ -161,7 +161,7 @@ impl<'a, T: AccountSerialize + AccountDeserialize + Clone> Deref for ProgramAcco type Target = T; fn deref(&self) -> &Self::Target { - &(*self.inner).account + &self.inner.account } } diff --git a/lang/src/accounts/state.rs b/lang/src/accounts/state.rs index 563409fdb5..87defe9e7e 100644 --- a/lang/src/accounts/state.rs +++ b/lang/src/accounts/state.rs @@ -122,7 +122,7 @@ impl<'a, T: AccountSerialize + AccountDeserialize + Clone> Deref for ProgramStat type Target = T; fn deref(&self) -> &Self::Target { - &(*self.inner).account + &self.inner.account } } diff --git a/lang/src/lib.rs b/lang/src/lib.rs index 65147d87de..c6f5e2ad9a 100644 --- a/lang/src/lib.rs +++ b/lang/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::crate_in_macro_def, clippy::result_large_err)] + //! Anchor âš“ is a framework for Solana's Sealevel runtime providing several //! convenient developer tools. //! @@ -305,6 +307,7 @@ pub mod __private { #[doc(hidden)] impl ZeroCopyAccessor for [u8; 32] { fn get(&self) -> Pubkey { + #[allow(deprecated)] Pubkey::new(self) } fn set(input: &Pubkey) -> [u8; 32] { diff --git a/lang/src/system_program.rs b/lang/src/system_program.rs index 4072baa114..741a714bce 100644 --- a/lang/src/system_program.rs +++ b/lang/src/system_program.rs @@ -12,8 +12,8 @@ impl anchor_lang::Id for System { } } -pub fn advance_nonce_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, AdvanceNonceAccount<'info>>, +pub fn advance_nonce_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, AdvanceNonceAccount<'info>>, ) -> Result<()> { let ix = crate::solana_program::system_instruction::advance_nonce_account( ctx.accounts.nonce.key, @@ -38,8 +38,8 @@ pub struct AdvanceNonceAccount<'info> { pub recent_blockhashes: AccountInfo<'info>, } -pub fn allocate<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Allocate<'info>>, +pub fn allocate<'info>( + ctx: CpiContext<'_, '_, '_, 'info, Allocate<'info>>, space: u64, ) -> Result<()> { let ix = crate::solana_program::system_instruction::allocate( @@ -59,8 +59,8 @@ pub struct Allocate<'info> { pub account_to_allocate: AccountInfo<'info>, } -pub fn allocate_with_seed<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, AllocateWithSeed<'info>>, +pub fn allocate_with_seed<'info>( + ctx: CpiContext<'_, '_, '_, 'info, AllocateWithSeed<'info>>, seed: &str, space: u64, owner: &Pubkey, @@ -86,8 +86,8 @@ pub struct AllocateWithSeed<'info> { pub base: AccountInfo<'info>, } -pub fn assign<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Assign<'info>>, +pub fn assign<'info>( + ctx: CpiContext<'_, '_, '_, 'info, Assign<'info>>, owner: &Pubkey, ) -> Result<()> { let ix = crate::solana_program::system_instruction::assign( @@ -107,8 +107,8 @@ pub struct Assign<'info> { pub account_to_assign: AccountInfo<'info>, } -pub fn assign_with_seed<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, AssignWithSeed<'info>>, +pub fn assign_with_seed<'info>( + ctx: CpiContext<'_, '_, '_, 'info, AssignWithSeed<'info>>, seed: &str, owner: &Pubkey, ) -> Result<()> { @@ -132,8 +132,8 @@ pub struct AssignWithSeed<'info> { pub base: AccountInfo<'info>, } -pub fn authorize_nonce_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, AuthorizeNonceAccount<'info>>, +pub fn authorize_nonce_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, AuthorizeNonceAccount<'info>>, new_authority: &Pubkey, ) -> Result<()> { let ix = crate::solana_program::system_instruction::authorize_nonce_account( @@ -155,8 +155,8 @@ pub struct AuthorizeNonceAccount<'info> { pub authorized: AccountInfo<'info>, } -pub fn create_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, CreateAccount<'info>>, +pub fn create_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, CreateAccount<'info>>, lamports: u64, space: u64, owner: &Pubkey, @@ -182,8 +182,8 @@ pub struct CreateAccount<'info> { pub to: AccountInfo<'info>, } -pub fn create_account_with_seed<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, CreateAccountWithSeed<'info>>, +pub fn create_account_with_seed<'info>( + ctx: CpiContext<'_, '_, '_, 'info, CreateAccountWithSeed<'info>>, seed: &str, lamports: u64, space: u64, @@ -213,8 +213,8 @@ pub struct CreateAccountWithSeed<'info> { pub base: AccountInfo<'info>, } -pub fn create_nonce_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, CreateNonceAccount<'info>>, +pub fn create_nonce_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, CreateNonceAccount<'info>>, lamports: u64, authority: &Pubkey, ) -> Result<()> { @@ -250,8 +250,8 @@ pub struct CreateNonceAccount<'info> { pub rent: AccountInfo<'info>, } -pub fn create_nonce_account_with_seed<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, CreateNonceAccountWithSeed<'info>>, +pub fn create_nonce_account_with_seed<'info>( + ctx: CpiContext<'_, '_, '_, 'info, CreateNonceAccountWithSeed<'info>>, lamports: u64, seed: &str, authority: &Pubkey, @@ -295,8 +295,8 @@ pub struct CreateNonceAccountWithSeed<'info> { pub rent: AccountInfo<'info>, } -pub fn transfer<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Transfer<'info>>, +pub fn transfer<'info>( + ctx: CpiContext<'_, '_, '_, 'info, Transfer<'info>>, lamports: u64, ) -> Result<()> { let ix = crate::solana_program::system_instruction::transfer( @@ -318,8 +318,8 @@ pub struct Transfer<'info> { pub to: AccountInfo<'info>, } -pub fn transfer_with_seed<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, TransferWithSeed<'info>>, +pub fn transfer_with_seed<'info>( + ctx: CpiContext<'_, '_, '_, 'info, TransferWithSeed<'info>>, from_seed: String, from_owner: &Pubkey, lamports: u64, @@ -347,8 +347,8 @@ pub struct TransferWithSeed<'info> { pub to: AccountInfo<'info>, } -pub fn withdraw_nonce_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, WithdrawNonceAccount<'info>>, +pub fn withdraw_nonce_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, WithdrawNonceAccount<'info>>, lamports: u64, ) -> Result<()> { let ix = crate::solana_program::system_instruction::withdraw_nonce_account( diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 26d034f896..cc64c48c3e 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor syntax parsing and code generation tools" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [features] diff --git a/lang/syn/src/codegen/program/instruction.rs b/lang/syn/src/codegen/program/instruction.rs index 9191d05d70..a5ba268a9b 100644 --- a/lang/syn/src/codegen/program/instruction.rs +++ b/lang/syn/src/codegen/program/instruction.rs @@ -11,7 +11,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { let ctor_args: Vec = generate_ctor_typed_args(state) .iter() .map(|arg| { - format!("pub {}", parser::tts_to_string(&arg)) + format!("pub {}", parser::tts_to_string(arg)) .parse() .unwrap() }) diff --git a/lang/syn/src/idl/file.rs b/lang/syn/src/idl/file.rs index 9f2b2ef9c1..8eb535dc47 100644 --- a/lang/syn/src/idl/file.rs +++ b/lang/syn/src/idl/file.rs @@ -652,7 +652,7 @@ fn resolve_variable_array_lengths(ctx: &CrateContext, mut tts_string: String) -> } fn to_idl_type(ctx: &CrateContext, ty: &syn::Type) -> IdlType { - let mut tts_string = parser::tts_to_string(&ty); + let mut tts_string = parser::tts_to_string(ty); if tts_string.starts_with('[') { tts_string = resolve_variable_array_lengths(ctx, tts_string); } diff --git a/lang/syn/src/idl/pda.rs b/lang/syn/src/idl/pda.rs index 26e1453172..4b4f28dbcd 100644 --- a/lang/syn/src/idl/pda.rs +++ b/lang/syn/src/idl/pda.rs @@ -267,7 +267,7 @@ impl SeedPath { // Extracts the seed path from a single seed expression. fn parse_seed_path(seed: &Expr) -> Option { // Convert the seed into the raw string representation. - let seed_str = parser::tts_to_string(&seed); + let seed_str = parser::tts_to_string(seed); // Break up the seed into each sub field component. let mut components: Vec<&str> = seed_str.split(" . ").collect(); diff --git a/lang/syn/src/lib.rs b/lang/syn/src/lib.rs index 5aeac91b4a..675745bf06 100644 --- a/lang/syn/src/lib.rs +++ b/lang/syn/src/lib.rs @@ -164,7 +164,7 @@ impl AccountsStruct { instruction_api .iter() .map(|expr| { - let arg = parser::tts_to_string(&expr); + let arg = parser::tts_to_string(expr); let components: Vec<&str> = arg.split(" : ").collect(); assert!(components.len() == 2); (components[0].to_string(), components[1].to_string()) diff --git a/lang/syn/src/parser/accounts/mod.rs b/lang/syn/src/parser/accounts/mod.rs index 5d9d19babe..733e1b737e 100644 --- a/lang/syn/src/parser/accounts/mod.rs +++ b/lang/syn/src/parser/accounts/mod.rs @@ -33,7 +33,7 @@ pub fn parse(strct: &syn::ItemStruct) -> ParseResult { } }; - let _ = constraints_cross_checks(&fields)?; + constraints_cross_checks(&fields)?; Ok(AccountsStruct::new(strct.clone(), fields, instruction_api)) } @@ -340,7 +340,7 @@ fn parse_program_account_loader(path: &syn::Path) -> ParseResult ParseResult { let account_type_path = parse_account(path)?; - let boxed = parser::tts_to_string(&path) + let boxed = parser::tts_to_string(path) .replace(' ', "") .starts_with("Box impl Iterator { self.modules - .iter() - .map(move |(_, detail)| ModuleContext { detail }) + .values() + .map(move |detail| ModuleContext { detail }) } pub fn root_module(&self) -> ModuleContext { diff --git a/lang/syn/src/parser/error.rs b/lang/syn/src/parser/error.rs index 5967b08627..b93e29a067 100644 --- a/lang/syn/src/parser/error.rs +++ b/lang/syn/src/parser/error.rs @@ -27,12 +27,9 @@ pub fn parse(error_enum: &mut syn::ItemEnum, args: Option) -> Error { last_discriminant = id + 1; // Remove any non-doc attributes on the error variant. - variant.attrs = variant + variant .attrs - .iter() - .filter(|attr| attr.path.segments[0].ident == "doc") - .cloned() - .collect(); + .retain(|attr| attr.path.segments[0].ident == "doc"); ErrorCode { id, ident, msg } }) diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 8ec1336ce9..0d62cc270d 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-spl" version = "0.25.0" authors = ["Serum Foundation "] -rust-version = "1.56" +rust-version = "1.59" edition = "2021" license = "Apache-2.0" description = "CPI clients for SPL programs" @@ -21,7 +21,7 @@ dex = ["serum_dex"] [dependencies] anchor-lang = { path = "../lang", version = "0.25.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.10.29" -spl-token = { version = "~3.3.0", features = ["no-entrypoint"], optional = true } -spl-associated-token-account = { version = "~1.0.5", features = ["no-entrypoint"], optional = true } +solana-program = "1.10.29" +spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } +spl-associated-token-account = { version = "1.1.0", features = ["no-entrypoint"], optional = true } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } diff --git a/spl/src/associated_token.rs b/spl/src/associated_token.rs index c6a5db14b3..53bf460a3a 100644 --- a/spl/src/associated_token.rs +++ b/spl/src/associated_token.rs @@ -10,6 +10,7 @@ pub fn create<'info>(ctx: CpiContext<'_, '_, '_, 'info, Create<'info>>) -> Resul ctx.accounts.payer.key, ctx.accounts.authority.key, ctx.accounts.mint.key, + ctx.accounts.token_program.key, ); solana_program::program::invoke_signed( &ix, diff --git a/spl/src/lib.rs b/spl/src/lib.rs index 5ba8cc4136..7ebd662ed3 100644 --- a/spl/src/lib.rs +++ b/spl/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::result_large_err)] + #[cfg(feature = "associated_token")] pub mod associated_token; diff --git a/spl/src/token.rs b/spl/src/token.rs index abbd5ce0b0..5519300cd7 100644 --- a/spl/src/token.rs +++ b/spl/src/token.rs @@ -9,8 +9,8 @@ use std::ops::Deref; pub use spl_token; pub use spl_token::ID; -pub fn transfer<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Transfer<'info>>, +pub fn transfer<'info>( + ctx: CpiContext<'_, '_, '_, 'info, Transfer<'info>>, amount: u64, ) -> Result<()> { let ix = spl_token::instruction::transfer( @@ -33,8 +33,8 @@ pub fn transfer<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn mint_to<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, MintTo<'info>>, +pub fn mint_to<'info>( + ctx: CpiContext<'_, '_, '_, 'info, MintTo<'info>>, amount: u64, ) -> Result<()> { let ix = spl_token::instruction::mint_to( @@ -57,10 +57,7 @@ pub fn mint_to<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn burn<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Burn<'info>>, - amount: u64, -) -> Result<()> { +pub fn burn<'info>(ctx: CpiContext<'_, '_, '_, 'info, Burn<'info>>, amount: u64) -> Result<()> { let ix = spl_token::instruction::burn( &spl_token::ID, ctx.accounts.from.key, @@ -81,8 +78,8 @@ pub fn burn<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn approve<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, Approve<'info>>, +pub fn approve<'info>( + ctx: CpiContext<'_, '_, '_, 'info, Approve<'info>>, amount: u64, ) -> Result<()> { let ix = spl_token::instruction::approve( @@ -105,7 +102,7 @@ pub fn approve<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn revoke<'a, 'b, 'c, 'info>(ctx: CpiContext<'a, 'b, 'c, 'info, Revoke<'info>>) -> Result<()> { +pub fn revoke<'info>(ctx: CpiContext<'_, '_, '_, 'info, Revoke<'info>>) -> Result<()> { let ix = spl_token::instruction::revoke( &spl_token::ID, ctx.accounts.source.key, @@ -120,8 +117,8 @@ pub fn revoke<'a, 'b, 'c, 'info>(ctx: CpiContext<'a, 'b, 'c, 'info, Revoke<'info .map_err(Into::into) } -pub fn initialize_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, InitializeAccount<'info>>, +pub fn initialize_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, InitializeAccount<'info>>, ) -> Result<()> { let ix = spl_token::instruction::initialize_account( &spl_token::ID, @@ -142,9 +139,7 @@ pub fn initialize_account<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn close_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, CloseAccount<'info>>, -) -> Result<()> { +pub fn close_account<'info>(ctx: CpiContext<'_, '_, '_, 'info, CloseAccount<'info>>) -> Result<()> { let ix = spl_token::instruction::close_account( &spl_token::ID, ctx.accounts.account.key, @@ -164,8 +159,8 @@ pub fn close_account<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn freeze_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, FreezeAccount<'info>>, +pub fn freeze_account<'info>( + ctx: CpiContext<'_, '_, '_, 'info, FreezeAccount<'info>>, ) -> Result<()> { let ix = spl_token::instruction::freeze_account( &spl_token::ID, @@ -186,9 +181,7 @@ pub fn freeze_account<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn thaw_account<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, ThawAccount<'info>>, -) -> Result<()> { +pub fn thaw_account<'info>(ctx: CpiContext<'_, '_, '_, 'info, ThawAccount<'info>>) -> Result<()> { let ix = spl_token::instruction::thaw_account( &spl_token::ID, ctx.accounts.account.key, @@ -208,8 +201,8 @@ pub fn thaw_account<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn initialize_mint<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, InitializeMint<'info>>, +pub fn initialize_mint<'info>( + ctx: CpiContext<'_, '_, '_, 'info, InitializeMint<'info>>, decimals: u8, authority: &Pubkey, freeze_authority: Option<&Pubkey>, @@ -229,8 +222,8 @@ pub fn initialize_mint<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn set_authority<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, SetAuthority<'info>>, +pub fn set_authority<'info>( + ctx: CpiContext<'_, '_, '_, 'info, SetAuthority<'info>>, authority_type: spl_token::instruction::AuthorityType, new_authority: Option, ) -> Result<()> { @@ -258,9 +251,7 @@ pub fn set_authority<'a, 'b, 'c, 'info>( .map_err(Into::into) } -pub fn sync_native<'a, 'b, 'c, 'info>( - ctx: CpiContext<'a, 'b, 'c, 'info, SyncNative<'info>>, -) -> Result<()> { +pub fn sync_native<'info>(ctx: CpiContext<'_, '_, '_, 'info, SyncNative<'info>>) -> Result<()> { let ix = spl_token::instruction::sync_native(&spl_token::ID, ctx.accounts.account.key)?; solana_program::program::invoke_signed(&ix, &[ctx.accounts.account.clone()], ctx.signer_seeds) .map_err(Into::into) diff --git a/tests/auction-house b/tests/auction-house index 63e7bb81be..b73b60e55a 160000 --- a/tests/auction-house +++ b/tests/auction-house @@ -1 +1 @@ -Subproject commit 63e7bb81beb76f2722245a37c16a7b0b00d6905a +Subproject commit b73b60e55a87bda1d2770c7c10db920db9cdb06b diff --git a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml index 637cf46a08..65ae7cb596 100644 --- a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml +++ b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml @@ -2,7 +2,7 @@ name = "bpf-upgradeable-state" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/cashiers-check/programs/cashiers-check/Cargo.toml b/tests/cashiers-check/programs/cashiers-check/Cargo.toml index 898ad63929..94ef74ad75 100644 --- a/tests/cashiers-check/programs/cashiers-check/Cargo.toml +++ b/tests/cashiers-check/programs/cashiers-check/Cargo.toml @@ -2,7 +2,7 @@ name = "cashiers-check" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/cfo/deps/stake b/tests/cfo/deps/stake index 6a1c128e85..fd78344ab5 160000 --- a/tests/cfo/deps/stake +++ b/tests/cfo/deps/stake @@ -1 +1 @@ -Subproject commit 6a1c128e859b13b39812c0c75d202b2bf9ee1e8c +Subproject commit fd78344ab5f34c36a91bdaf8b9edf2fbd8a93510 diff --git a/tests/cfo/deps/swap b/tests/cfo/deps/swap index 3da36aaae7..24c6e5c984 160000 --- a/tests/cfo/deps/swap +++ b/tests/cfo/deps/swap @@ -1 +1 @@ -Subproject commit 3da36aaae7af6ce901d68c0280aac34817fe7fd8 +Subproject commit 24c6e5c9845f5f4cbfd51bd239fcbe6eaa2e5337 diff --git a/tests/cfo/programs/cfo/Cargo.toml b/tests/cfo/programs/cfo/Cargo.toml index b6260afadf..4effaef6ce 100644 --- a/tests/cfo/programs/cfo/Cargo.toml +++ b/tests/cfo/programs/cfo/Cargo.toml @@ -2,7 +2,7 @@ name = "cfo" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] @@ -19,7 +19,7 @@ test = [] [dependencies] anchor-lang = { path = "../../../../lang" } anchor-spl = { path = "../../../../spl" } -spl-token = { version = "~3.3.0", features = ["no-entrypoint"] } +spl-token = { version = "3.3.0", features = ["no-entrypoint"] } swap = { path = "../../deps/swap/programs/swap", features = ["cpi"] } serum_dex = { path = "../../deps/serum-dex/dex", features = ["no-entrypoint"] } registry = { path = "../../deps/stake/programs/registry", features = ["cpi"] } diff --git a/tests/chat/programs/chat/Cargo.toml b/tests/chat/programs/chat/Cargo.toml index 727c559659..45b1f10d95 100644 --- a/tests/chat/programs/chat/Cargo.toml +++ b/tests/chat/programs/chat/Cargo.toml @@ -2,7 +2,7 @@ name = "chat" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/composite/programs/composite/Cargo.toml b/tests/composite/programs/composite/Cargo.toml index d350417900..e8508d2fda 100644 --- a/tests/composite/programs/composite/Cargo.toml +++ b/tests/composite/programs/composite/Cargo.toml @@ -2,7 +2,7 @@ name = "composite" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/custom-coder/Cargo.toml b/tests/custom-coder/programs/custom-coder/Cargo.toml index 0420384405..51fafc5fc6 100644 --- a/tests/custom-coder/programs/custom-coder/Cargo.toml +++ b/tests/custom-coder/programs/custom-coder/Cargo.toml @@ -2,7 +2,7 @@ name = "custom-coder" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/native-system/Cargo.toml b/tests/custom-coder/programs/native-system/Cargo.toml index b805cdb25f..c12fa81f67 100644 --- a/tests/custom-coder/programs/native-system/Cargo.toml +++ b/tests/custom-coder/programs/native-system/Cargo.toml @@ -2,7 +2,7 @@ name = "native-system" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/spl-token/Cargo.toml b/tests/custom-coder/programs/spl-token/Cargo.toml index ff88b486b3..988b54507d 100644 --- a/tests/custom-coder/programs/spl-token/Cargo.toml +++ b/tests/custom-coder/programs/spl-token/Cargo.toml @@ -2,7 +2,7 @@ name = "spl-token" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/errors/programs/errors/Cargo.toml b/tests/errors/programs/errors/Cargo.toml index 9834876c78..d4f5d665fc 100644 --- a/tests/errors/programs/errors/Cargo.toml +++ b/tests/errors/programs/errors/Cargo.toml @@ -2,7 +2,7 @@ name = "errors" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/escrow/programs/escrow/Cargo.toml b/tests/escrow/programs/escrow/Cargo.toml index f640f0511b..934997939b 100644 --- a/tests/escrow/programs/escrow/Cargo.toml +++ b/tests/escrow/programs/escrow/Cargo.toml @@ -2,7 +2,7 @@ name = "escrow" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/events/programs/events/Cargo.toml b/tests/events/programs/events/Cargo.toml index cfa78b6ae2..252eb6d9ac 100644 --- a/tests/events/programs/events/Cargo.toml +++ b/tests/events/programs/events/Cargo.toml @@ -2,7 +2,7 @@ name = "events" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/ido-pool/programs/ido-pool/Cargo.toml b/tests/ido-pool/programs/ido-pool/Cargo.toml index 0a54b96042..4ed124f34a 100644 --- a/tests/ido-pool/programs/ido-pool/Cargo.toml +++ b/tests/ido-pool/programs/ido-pool/Cargo.toml @@ -2,7 +2,7 @@ name = "ido-pool" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/interface/programs/counter-auth/Cargo.toml b/tests/interface/programs/counter-auth/Cargo.toml index 62fdaefbb0..abf20bb5d0 100644 --- a/tests/interface/programs/counter-auth/Cargo.toml +++ b/tests/interface/programs/counter-auth/Cargo.toml @@ -2,7 +2,7 @@ name = "counter-auth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/interface/programs/counter/Cargo.toml b/tests/interface/programs/counter/Cargo.toml index 23326e74c6..d73bc60d09 100644 --- a/tests/interface/programs/counter/Cargo.toml +++ b/tests/interface/programs/counter/Cargo.toml @@ -2,7 +2,7 @@ name = "counter" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/lockup/programs/lockup/Cargo.toml b/tests/lockup/programs/lockup/Cargo.toml index e53f74d3ed..c9b37e3d01 100644 --- a/tests/lockup/programs/lockup/Cargo.toml +++ b/tests/lockup/programs/lockup/Cargo.toml @@ -2,7 +2,7 @@ name = "lockup" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/lockup/programs/registry/Cargo.toml b/tests/lockup/programs/registry/Cargo.toml index 9b67806c87..1f93b1e770 100644 --- a/tests/lockup/programs/registry/Cargo.toml +++ b/tests/lockup/programs/registry/Cargo.toml @@ -2,7 +2,7 @@ name = "registry" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/misc/programs/idl_doc/Cargo.toml b/tests/misc/programs/idl_doc/Cargo.toml index 000d3cdba3..447a29b96f 100644 --- a/tests/misc/programs/idl_doc/Cargo.toml +++ b/tests/misc/programs/idl_doc/Cargo.toml @@ -2,7 +2,7 @@ name = "idl_doc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/misc/programs/misc/Cargo.toml b/tests/misc/programs/misc/Cargo.toml index a18e4c1c85..44b9680d64 100644 --- a/tests/misc/programs/misc/Cargo.toml +++ b/tests/misc/programs/misc/Cargo.toml @@ -2,7 +2,7 @@ name = "misc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] @@ -19,4 +19,4 @@ default = [] anchor-lang = { path = "../../../../lang", features = ["init-if-needed"] } anchor-spl = { path = "../../../../spl" } misc2 = { path = "../misc2", features = ["cpi"] } -spl-associated-token-account = "~1.0.3" +spl-associated-token-account = "1.0.3" diff --git a/tests/misc/programs/misc2/Cargo.toml b/tests/misc/programs/misc2/Cargo.toml index d3eb02951d..2a66a37aa1 100644 --- a/tests/misc/programs/misc2/Cargo.toml +++ b/tests/misc/programs/misc2/Cargo.toml @@ -2,7 +2,7 @@ name = "misc2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/misc/programs/shared/Cargo.toml b/tests/misc/programs/shared/Cargo.toml index c0dff4a022..c95b4a603f 100644 --- a/tests/misc/programs/shared/Cargo.toml +++ b/tests/misc/programs/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/multisig/programs/multisig/Cargo.toml b/tests/multisig/programs/multisig/Cargo.toml index 66157d8f91..7d3cb4f051 100644 --- a/tests/multisig/programs/multisig/Cargo.toml +++ b/tests/multisig/programs/multisig/Cargo.toml @@ -2,7 +2,7 @@ name = "multisig" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/pda-derivation/programs/pda-derivation/Cargo.toml b/tests/pda-derivation/programs/pda-derivation/Cargo.toml index 0cb47eb342..1592a4c33b 100644 --- a/tests/pda-derivation/programs/pda-derivation/Cargo.toml +++ b/tests/pda-derivation/programs/pda-derivation/Cargo.toml @@ -2,7 +2,7 @@ name = "pda-derivation" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/pyth/programs/pyth/Cargo.toml b/tests/pyth/programs/pyth/Cargo.toml index b71aec7a36..2d83d93e7b 100644 --- a/tests/pyth/programs/pyth/Cargo.toml +++ b/tests/pyth/programs/pyth/Cargo.toml @@ -2,7 +2,7 @@ name = "pyth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml index 9559a96866..d84572afa4 100644 --- a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml +++ b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml @@ -2,7 +2,7 @@ name = "token-proxy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/swap/programs/swap/Cargo.toml b/tests/swap/programs/swap/Cargo.toml index af3e076357..28d1d145b7 100644 --- a/tests/swap/programs/swap/Cargo.toml +++ b/tests/swap/programs/swap/Cargo.toml @@ -2,7 +2,7 @@ name = "swap" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/system-accounts/programs/system-accounts/Cargo.toml b/tests/system-accounts/programs/system-accounts/Cargo.toml index de8235fc4b..968b976fd5 100644 --- a/tests/system-accounts/programs/system-accounts/Cargo.toml +++ b/tests/system-accounts/programs/system-accounts/Cargo.toml @@ -2,7 +2,7 @@ name = "system-accounts" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/sysvars/programs/sysvars/Cargo.toml b/tests/sysvars/programs/sysvars/Cargo.toml index 43a178a0ec..1acfea7b41 100644 --- a/tests/sysvars/programs/sysvars/Cargo.toml +++ b/tests/sysvars/programs/sysvars/Cargo.toml @@ -2,7 +2,7 @@ name = "sysvars" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/tictactoe/programs/tictactoe/Cargo.toml b/tests/tictactoe/programs/tictactoe/Cargo.toml index 445607fd0f..914d56b70e 100644 --- a/tests/tictactoe/programs/tictactoe/Cargo.toml +++ b/tests/tictactoe/programs/tictactoe/Cargo.toml @@ -2,7 +2,7 @@ name = "tictactoe" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/typescript/programs/shared/Cargo.toml b/tests/typescript/programs/shared/Cargo.toml index c0dff4a022..c95b4a603f 100644 --- a/tests/typescript/programs/shared/Cargo.toml +++ b/tests/typescript/programs/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/typescript/programs/typescript/Cargo.toml b/tests/typescript/programs/typescript/Cargo.toml index 4d043312c5..2ea32b293f 100644 --- a/tests/typescript/programs/typescript/Cargo.toml +++ b/tests/typescript/programs/typescript/Cargo.toml @@ -2,7 +2,7 @@ name = "typescript" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/shared/Cargo.toml b/tests/zero-copy/programs/shared/Cargo.toml index c0dff4a022..c95b4a603f 100644 --- a/tests/zero-copy/programs/shared/Cargo.toml +++ b/tests/zero-copy/programs/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/zero-copy/programs/zero-copy/Cargo.toml b/tests/zero-copy/programs/zero-copy/Cargo.toml index 4f77119076..71c50af289 100644 --- a/tests/zero-copy/programs/zero-copy/Cargo.toml +++ b/tests/zero-copy/programs/zero-copy/Cargo.toml @@ -2,7 +2,7 @@ name = "zero-copy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/zero-cpi/Cargo.toml b/tests/zero-copy/programs/zero-cpi/Cargo.toml index c4b4e4400f..eb9da9db8f 100644 --- a/tests/zero-copy/programs/zero-cpi/Cargo.toml +++ b/tests/zero-copy/programs/zero-cpi/Cargo.toml @@ -2,7 +2,7 @@ name = "zero-cpi" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.56" +rust-version = "1.59" edition = "2021" [lib] From ed5cb3e3d8d7f7b19349e39f91bbe297e32d7cb7 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Sat, 29 Apr 2023 17:37:02 -0500 Subject: [PATCH 18/45] Attempted to suppress errors and update msrv --- avm/Cargo.toml | 2 +- cli/Cargo.toml | 2 +- client/Cargo.toml | 2 +- client/example/Cargo.toml | 2 +- client/src/cluster.rs | 9 ++------- clippy.toml | 2 +- examples/tutorial/basic-0/programs/basic-0/Cargo.toml | 2 +- examples/tutorial/basic-1/programs/basic-1/Cargo.toml | 2 +- examples/tutorial/basic-2/programs/basic-2/Cargo.toml | 2 +- .../tutorial/basic-3/programs/puppet-master/Cargo.toml | 2 +- examples/tutorial/basic-3/programs/puppet/Cargo.toml | 2 +- examples/tutorial/basic-4/programs/basic-4/Cargo.toml | 2 +- lang/Cargo.toml | 2 +- lang/attribute/access-control/Cargo.toml | 2 +- lang/attribute/account/Cargo.toml | 2 +- lang/attribute/constant/Cargo.toml | 2 +- lang/attribute/error/Cargo.toml | 2 +- lang/attribute/event/Cargo.toml | 2 +- lang/attribute/interface/Cargo.toml | 2 +- lang/attribute/program/Cargo.toml | 2 +- lang/attribute/state/Cargo.toml | 2 +- lang/derive/accounts/Cargo.toml | 2 +- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 2 +- .../programs/bpf-upgradeable-state/Cargo.toml | 2 +- tests/cashiers-check/programs/cashiers-check/Cargo.toml | 2 +- tests/cfo/programs/cfo/Cargo.toml | 2 +- tests/chat/programs/chat/Cargo.toml | 2 +- tests/composite/programs/composite/Cargo.toml | 2 +- tests/custom-coder/programs/custom-coder/Cargo.toml | 2 +- tests/custom-coder/programs/native-system/Cargo.toml | 2 +- tests/custom-coder/programs/spl-token/Cargo.toml | 2 +- tests/errors/programs/errors/Cargo.toml | 2 +- tests/escrow/programs/escrow/Cargo.toml | 2 +- tests/events/programs/events/Cargo.toml | 2 +- tests/ido-pool/programs/ido-pool/Cargo.toml | 2 +- tests/interface/programs/counter-auth/Cargo.toml | 2 +- tests/interface/programs/counter/Cargo.toml | 2 +- tests/lockup/programs/lockup/Cargo.toml | 2 +- tests/lockup/programs/registry/Cargo.toml | 2 +- tests/misc/programs/idl_doc/Cargo.toml | 2 +- tests/misc/programs/misc/Cargo.toml | 2 +- tests/misc/programs/misc2/Cargo.toml | 2 +- tests/misc/programs/shared/Cargo.toml | 3 ++- tests/multisig/programs/multisig/Cargo.toml | 2 +- tests/pda-derivation/programs/pda-derivation/Cargo.toml | 2 +- tests/pyth/programs/pyth/Cargo.toml | 2 +- tests/spl/token-proxy/programs/token-proxy/Cargo.toml | 2 +- tests/swap/programs/swap/Cargo.toml | 3 ++- .../system-accounts/programs/system-accounts/Cargo.toml | 2 +- tests/sysvars/programs/sysvars/Cargo.toml | 2 +- tests/tictactoe/programs/tictactoe/Cargo.toml | 2 +- tests/typescript/programs/shared/Cargo.toml | 3 ++- tests/typescript/programs/typescript/Cargo.toml | 2 +- tests/zero-copy/programs/shared/Cargo.toml | 2 +- tests/zero-copy/programs/zero-copy/Cargo.toml | 2 +- tests/zero-copy/programs/zero-cpi/Cargo.toml | 2 +- 57 files changed, 61 insertions(+), 63 deletions(-) diff --git a/avm/Cargo.toml b/avm/Cargo.toml index c460b49338..59530a04d0 100644 --- a/avm/Cargo.toml +++ b/avm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm" version = "0.25.0" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [[bin]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7173fab779..29926611a3 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-cli" version = "0.25.13" authors = ["armaniferrante "] -rust-version = "1.59" +rust-version = "1.62" edition = "2021" repository = "https://github.com/coral-xyz/anchor" description = "Anchor CLI" diff --git a/client/Cargo.toml b/client/Cargo.toml index 0f09e65c45..2c6d1c7117 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-client" version = "0.25.0" authors = ["Serum Foundation "] -rust-version = "1.59" +rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "Rust client for Anchor programs" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 3ec1a843da..7349eac7e4 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -2,7 +2,7 @@ name = "example" version = "0.1.0" authors = ["Armani Ferrante "] -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [workspace] diff --git a/client/src/cluster.rs b/client/src/cluster.rs index 47a37e41d9..dc46df0885 100644 --- a/client/src/cluster.rs +++ b/client/src/cluster.rs @@ -3,22 +3,17 @@ use serde::{Deserialize, Serialize}; use std::str::FromStr; use url::Url; -#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)] +#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Default)] pub enum Cluster { Testnet, Mainnet, Devnet, + #[default] Localnet, Debug, Custom(String, String), } -impl Default for Cluster { - fn default() -> Self { - Cluster::Localnet - } -} - impl FromStr for Cluster { type Err = anyhow::Error; fn from_str(s: &str) -> Result { diff --git a/clippy.toml b/clippy.toml index abe19b3a00..6bfeada7fa 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.59" +msrv = "1.62" diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml index fff101680f..24610332de 100644 --- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml +++ b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-0" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml index f6b91f1689..b0c58db394 100644 --- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml +++ b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-1" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml index f25afb8a8f..17c55c3517 100644 --- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml +++ b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml index cbdc18a5e0..35ad97a139 100644 --- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml @@ -2,7 +2,7 @@ name = "puppet-master" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml index b4d4d11992..85d5a8555f 100644 --- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet/Cargo.toml @@ -2,7 +2,7 @@ name = "puppet" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml index 1d971632d4..ab69c4b739 100644 --- a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml +++ b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml @@ -2,7 +2,7 @@ name = "basic-4" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index a0a18525e6..f4a39184df 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -3,7 +3,7 @@ name = "anchor-lang" version = "0.25.0" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "Solana Sealevel eDSL" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 7bd124aa77..dee564471b 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for instruction access control" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index a813e37608..184b518ff9 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an account" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 51dc782967..a5fb8f7a11 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating constant types" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index b2fc8854ef..5c5910be34 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating error types" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 0eb45279dc..07bbbea1c8 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an event" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index cafb3d1ba7..0143c37992 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program interface trait" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index a5100e86c9..c03762f9cc 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining a program" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index b1372b1524..283f17e1d4 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program state struct" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index efffc6105d..5dcb3aa143 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor Derive macro for accounts" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index cc64c48c3e..c1452dc69c 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor syntax parsing and code generation tools" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [features] diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 0d62cc270d..4ff38bdd18 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-spl" version = "0.25.0" authors = ["Serum Foundation "] -rust-version = "1.59" +rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "CPI clients for SPL programs" diff --git a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml index 65ae7cb596..e9fca19019 100644 --- a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml +++ b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml @@ -2,7 +2,7 @@ name = "bpf-upgradeable-state" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/cashiers-check/programs/cashiers-check/Cargo.toml b/tests/cashiers-check/programs/cashiers-check/Cargo.toml index 94ef74ad75..165c5f432c 100644 --- a/tests/cashiers-check/programs/cashiers-check/Cargo.toml +++ b/tests/cashiers-check/programs/cashiers-check/Cargo.toml @@ -2,7 +2,7 @@ name = "cashiers-check" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/cfo/programs/cfo/Cargo.toml b/tests/cfo/programs/cfo/Cargo.toml index 4effaef6ce..1af78e40d9 100644 --- a/tests/cfo/programs/cfo/Cargo.toml +++ b/tests/cfo/programs/cfo/Cargo.toml @@ -2,7 +2,7 @@ name = "cfo" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/chat/programs/chat/Cargo.toml b/tests/chat/programs/chat/Cargo.toml index 45b1f10d95..6ba8679d6e 100644 --- a/tests/chat/programs/chat/Cargo.toml +++ b/tests/chat/programs/chat/Cargo.toml @@ -2,7 +2,7 @@ name = "chat" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/composite/programs/composite/Cargo.toml b/tests/composite/programs/composite/Cargo.toml index e8508d2fda..951b32c884 100644 --- a/tests/composite/programs/composite/Cargo.toml +++ b/tests/composite/programs/composite/Cargo.toml @@ -2,7 +2,7 @@ name = "composite" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/custom-coder/Cargo.toml b/tests/custom-coder/programs/custom-coder/Cargo.toml index 51fafc5fc6..166892b1cb 100644 --- a/tests/custom-coder/programs/custom-coder/Cargo.toml +++ b/tests/custom-coder/programs/custom-coder/Cargo.toml @@ -2,7 +2,7 @@ name = "custom-coder" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/native-system/Cargo.toml b/tests/custom-coder/programs/native-system/Cargo.toml index c12fa81f67..86d2efc67c 100644 --- a/tests/custom-coder/programs/native-system/Cargo.toml +++ b/tests/custom-coder/programs/native-system/Cargo.toml @@ -2,7 +2,7 @@ name = "native-system" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/spl-token/Cargo.toml b/tests/custom-coder/programs/spl-token/Cargo.toml index 988b54507d..99788da163 100644 --- a/tests/custom-coder/programs/spl-token/Cargo.toml +++ b/tests/custom-coder/programs/spl-token/Cargo.toml @@ -2,7 +2,7 @@ name = "spl-token" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/errors/programs/errors/Cargo.toml b/tests/errors/programs/errors/Cargo.toml index d4f5d665fc..8eb7236028 100644 --- a/tests/errors/programs/errors/Cargo.toml +++ b/tests/errors/programs/errors/Cargo.toml @@ -2,7 +2,7 @@ name = "errors" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/escrow/programs/escrow/Cargo.toml b/tests/escrow/programs/escrow/Cargo.toml index 934997939b..9da089348c 100644 --- a/tests/escrow/programs/escrow/Cargo.toml +++ b/tests/escrow/programs/escrow/Cargo.toml @@ -2,7 +2,7 @@ name = "escrow" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/events/programs/events/Cargo.toml b/tests/events/programs/events/Cargo.toml index 252eb6d9ac..62fc6f6d58 100644 --- a/tests/events/programs/events/Cargo.toml +++ b/tests/events/programs/events/Cargo.toml @@ -2,7 +2,7 @@ name = "events" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/ido-pool/programs/ido-pool/Cargo.toml b/tests/ido-pool/programs/ido-pool/Cargo.toml index 4ed124f34a..2eac5accee 100644 --- a/tests/ido-pool/programs/ido-pool/Cargo.toml +++ b/tests/ido-pool/programs/ido-pool/Cargo.toml @@ -2,7 +2,7 @@ name = "ido-pool" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/interface/programs/counter-auth/Cargo.toml b/tests/interface/programs/counter-auth/Cargo.toml index abf20bb5d0..0fd7e53b6b 100644 --- a/tests/interface/programs/counter-auth/Cargo.toml +++ b/tests/interface/programs/counter-auth/Cargo.toml @@ -2,7 +2,7 @@ name = "counter-auth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/interface/programs/counter/Cargo.toml b/tests/interface/programs/counter/Cargo.toml index d73bc60d09..b8a3ed4a2f 100644 --- a/tests/interface/programs/counter/Cargo.toml +++ b/tests/interface/programs/counter/Cargo.toml @@ -2,7 +2,7 @@ name = "counter" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/lockup/programs/lockup/Cargo.toml b/tests/lockup/programs/lockup/Cargo.toml index c9b37e3d01..f7d08c8c65 100644 --- a/tests/lockup/programs/lockup/Cargo.toml +++ b/tests/lockup/programs/lockup/Cargo.toml @@ -2,7 +2,7 @@ name = "lockup" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/lockup/programs/registry/Cargo.toml b/tests/lockup/programs/registry/Cargo.toml index 1f93b1e770..b0063e5aab 100644 --- a/tests/lockup/programs/registry/Cargo.toml +++ b/tests/lockup/programs/registry/Cargo.toml @@ -2,7 +2,7 @@ name = "registry" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/idl_doc/Cargo.toml b/tests/misc/programs/idl_doc/Cargo.toml index 447a29b96f..fb9ce877db 100644 --- a/tests/misc/programs/idl_doc/Cargo.toml +++ b/tests/misc/programs/idl_doc/Cargo.toml @@ -2,7 +2,7 @@ name = "idl_doc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/misc/Cargo.toml b/tests/misc/programs/misc/Cargo.toml index 44b9680d64..50cdd7600b 100644 --- a/tests/misc/programs/misc/Cargo.toml +++ b/tests/misc/programs/misc/Cargo.toml @@ -2,7 +2,7 @@ name = "misc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/misc2/Cargo.toml b/tests/misc/programs/misc2/Cargo.toml index 2a66a37aa1..da4824bb11 100644 --- a/tests/misc/programs/misc2/Cargo.toml +++ b/tests/misc/programs/misc2/Cargo.toml @@ -2,7 +2,7 @@ name = "misc2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/shared/Cargo.toml b/tests/misc/programs/shared/Cargo.toml index c95b4a603f..9c39f10916 100644 --- a/tests/misc/programs/shared/Cargo.toml +++ b/tests/misc/programs/shared/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/multisig/programs/multisig/Cargo.toml b/tests/multisig/programs/multisig/Cargo.toml index 7d3cb4f051..99a164258b 100644 --- a/tests/multisig/programs/multisig/Cargo.toml +++ b/tests/multisig/programs/multisig/Cargo.toml @@ -2,7 +2,7 @@ name = "multisig" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/pda-derivation/programs/pda-derivation/Cargo.toml b/tests/pda-derivation/programs/pda-derivation/Cargo.toml index 1592a4c33b..09c3b500bc 100644 --- a/tests/pda-derivation/programs/pda-derivation/Cargo.toml +++ b/tests/pda-derivation/programs/pda-derivation/Cargo.toml @@ -2,7 +2,7 @@ name = "pda-derivation" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/pyth/programs/pyth/Cargo.toml b/tests/pyth/programs/pyth/Cargo.toml index 2d83d93e7b..32989d6b3d 100644 --- a/tests/pyth/programs/pyth/Cargo.toml +++ b/tests/pyth/programs/pyth/Cargo.toml @@ -2,7 +2,7 @@ name = "pyth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml index d84572afa4..9aea4d798e 100644 --- a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml +++ b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml @@ -2,7 +2,7 @@ name = "token-proxy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/swap/programs/swap/Cargo.toml b/tests/swap/programs/swap/Cargo.toml index 28d1d145b7..374607244b 100644 --- a/tests/swap/programs/swap/Cargo.toml +++ b/tests/swap/programs/swap/Cargo.toml @@ -2,8 +2,9 @@ name = "swap" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" +publish = false [lib] crate-type = ["cdylib", "lib"] diff --git a/tests/system-accounts/programs/system-accounts/Cargo.toml b/tests/system-accounts/programs/system-accounts/Cargo.toml index 968b976fd5..dff6b21d6d 100644 --- a/tests/system-accounts/programs/system-accounts/Cargo.toml +++ b/tests/system-accounts/programs/system-accounts/Cargo.toml @@ -2,7 +2,7 @@ name = "system-accounts" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/sysvars/programs/sysvars/Cargo.toml b/tests/sysvars/programs/sysvars/Cargo.toml index 1acfea7b41..82f9726ac9 100644 --- a/tests/sysvars/programs/sysvars/Cargo.toml +++ b/tests/sysvars/programs/sysvars/Cargo.toml @@ -2,7 +2,7 @@ name = "sysvars" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/tictactoe/programs/tictactoe/Cargo.toml b/tests/tictactoe/programs/tictactoe/Cargo.toml index 914d56b70e..e7a016d8a4 100644 --- a/tests/tictactoe/programs/tictactoe/Cargo.toml +++ b/tests/tictactoe/programs/tictactoe/Cargo.toml @@ -2,7 +2,7 @@ name = "tictactoe" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/typescript/programs/shared/Cargo.toml b/tests/typescript/programs/shared/Cargo.toml index c95b4a603f..9c39f10916 100644 --- a/tests/typescript/programs/shared/Cargo.toml +++ b/tests/typescript/programs/shared/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/typescript/programs/typescript/Cargo.toml b/tests/typescript/programs/typescript/Cargo.toml index 2ea32b293f..4475fb56c7 100644 --- a/tests/typescript/programs/typescript/Cargo.toml +++ b/tests/typescript/programs/typescript/Cargo.toml @@ -2,7 +2,7 @@ name = "typescript" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/shared/Cargo.toml b/tests/zero-copy/programs/shared/Cargo.toml index c95b4a603f..b8fb9b9c18 100644 --- a/tests/zero-copy/programs/shared/Cargo.toml +++ b/tests/zero-copy/programs/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/zero-copy/programs/zero-copy/Cargo.toml b/tests/zero-copy/programs/zero-copy/Cargo.toml index 71c50af289..242ea322c1 100644 --- a/tests/zero-copy/programs/zero-copy/Cargo.toml +++ b/tests/zero-copy/programs/zero-copy/Cargo.toml @@ -2,7 +2,7 @@ name = "zero-copy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/zero-cpi/Cargo.toml b/tests/zero-copy/programs/zero-cpi/Cargo.toml index eb9da9db8f..158dae7226 100644 --- a/tests/zero-copy/programs/zero-cpi/Cargo.toml +++ b/tests/zero-copy/programs/zero-cpi/Cargo.toml @@ -2,7 +2,7 @@ name = "zero-cpi" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.59" +rust-version = "1.62" edition = "2021" [lib] From 927c5255406299453d13efda354390640d3e661f Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 5 May 2023 17:10:22 -0500 Subject: [PATCH 19/45] Added custom star atlas crate repo --- .cargo/config.toml | 36 +++++++++++++++ Cargo.lock | 28 ++++++------ avm/Cargo.lock | 2 +- avm/Cargo.toml | 3 +- cli/Cargo.toml | 44 +++++++++---------- client/Cargo.toml | 8 ++-- client/example/Cargo.toml | 1 - clippy.toml | 2 +- docs/src/pages/docs/publishing-source.md | 2 +- .../basic-0/programs/basic-0/Cargo.toml | 1 - .../basic-1/programs/basic-1/Cargo.toml | 1 - .../basic-2/programs/basic-2/Cargo.toml | 1 - .../basic-3/programs/puppet-master/Cargo.toml | 1 - .../basic-3/programs/puppet/Cargo.toml | 1 - .../basic-4/programs/basic-4/Cargo.toml | 1 - lang/Cargo.toml | 24 +++++----- lang/attribute/access-control/Cargo.toml | 10 ++--- lang/attribute/account/Cargo.toml | 12 ++--- lang/attribute/constant/Cargo.toml | 6 +-- lang/attribute/error/Cargo.toml | 6 +-- lang/attribute/event/Cargo.toml | 8 ++-- lang/attribute/interface/Cargo.toml | 10 ++--- lang/attribute/program/Cargo.toml | 8 ++-- lang/attribute/state/Cargo.toml | 8 ++-- lang/derive/accounts/Cargo.toml | 8 ++-- lang/syn/Cargo.toml | 14 +++--- rust-toolchain.toml | 6 +++ spl/Cargo.toml | 10 ++--- tests/auction-house | 2 +- .../programs/bpf-upgradeable-state/Cargo.toml | 1 - .../programs/cashiers-check/Cargo.toml | 1 - tests/cfo/programs/cfo/Cargo.toml | 1 - tests/chat/programs/chat/Cargo.toml | 1 - tests/composite/programs/composite/Cargo.toml | 1 - .../programs/custom-coder/Cargo.toml | 1 - .../programs/native-system/Cargo.toml | 1 - .../programs/spl-token/Cargo.toml | 1 - tests/errors/programs/errors/Cargo.toml | 1 - tests/escrow/programs/escrow/Cargo.toml | 1 - tests/events/programs/events/Cargo.toml | 1 - tests/ido-pool/programs/ido-pool/Cargo.toml | 1 - .../programs/counter-auth/Cargo.toml | 1 - tests/interface/programs/counter/Cargo.toml | 1 - tests/lockup/programs/lockup/Cargo.toml | 1 - tests/lockup/programs/registry/Cargo.toml | 1 - tests/misc/programs/idl_doc/Cargo.toml | 1 - tests/misc/programs/misc/Cargo.toml | 1 - tests/misc/programs/misc2/Cargo.toml | 1 - tests/misc/programs/shared/Cargo.toml | 1 - tests/multisig/programs/multisig/Cargo.toml | 1 - .../programs/pda-derivation/Cargo.toml | 1 - tests/pyth/programs/pyth/Cargo.toml | 1 - .../programs/token-proxy/Cargo.toml | 1 - tests/swap/programs/swap/Cargo.toml | 1 - .../programs/system-accounts/Cargo.toml | 1 - tests/sysvars/programs/sysvars/Cargo.toml | 1 - tests/tictactoe/programs/tictactoe/Cargo.toml | 1 - tests/typescript/programs/shared/Cargo.toml | 1 - .../typescript/programs/typescript/Cargo.toml | 1 - tests/zero-copy/programs/shared/Cargo.toml | 1 - tests/zero-copy/programs/zero-copy/Cargo.toml | 1 - tests/zero-copy/programs/zero-cpi/Cargo.toml | 1 - 62 files changed, 149 insertions(+), 148 deletions(-) create mode 100644 .cargo/config.toml create mode 100644 rust-toolchain.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000000..3a6117dc2e --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,36 @@ +[unstable] +registry-auth = true + +[registries.star-atlas] +index = "ssh://git@ssh.shipyard.rs/star-atlas/crate-index.git" + +[net] +git-fetch-with-cli = true + +## Uncomment if on stable +## Make sure to gitignore this file if uncommented +## authenticated downloads +## ----------------------- +## +## this setting is a hack to get cargo +## to send an auth token along with +## download requests. until RFC 3193 is +## implemented, this is our solution to ensure +## that crates can't be downloaded over the +## public internet with zero authentication (!) +## +## note: this setting is only needed if you are +## not using the currently unstable registry-auth +## feature in cargo. this setting is only available +## in cargo nightly 2022-11-17 or newer currently, +## and requires the unstable registry-auth feature +## to be enabled. +## +## note: the token value ('6MZafJNolbd...') +## is only an example. you should substitute an +## actual token value (create one on the +## Shipyard.rs/tokens page) instead of copying +## the example verbatim. +## +#[http] +#user-agent = "shipyard 6MZafJNolbdX6/NYE4q5lh7sPGl5fC8MFa5Ae4SbHHpULrEGMSK2/dKTuqxpGUQZTAE=" diff --git a/Cargo.lock b/Cargo.lock index dc08a35096..ba36dd8d08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,7 +97,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -109,7 +109,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -122,7 +122,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "proc-macro2 1.0.56", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "proc-macro2 1.0.56", @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.13" +version = "0.25.14" dependencies = [ "anchor-client", "anchor-lang", @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-lang", "anyhow", @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-syn", "anyhow", @@ -246,7 +246,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -268,7 +268,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/avm/Cargo.lock b/avm/Cargo.lock index 1a09fa4f43..1fc2ebc2ae 100644 --- a/avm/Cargo.lock +++ b/avm/Cargo.lock @@ -39,7 +39,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avm" -version = "0.25.0" +version = "0.25.14" dependencies = [ "anyhow", "cfg-if", diff --git a/avm/Cargo.toml b/avm/Cargo.toml index 59530a04d0..22d9a15fb8 100644 --- a/avm/Cargo.toml +++ b/avm/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "avm" -version = "0.25.0" -rust-version = "1.62" +version = "0.25.14" edition = "2021" [[bin]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 29926611a3..94973191ba 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-cli" -version = "0.25.13" +version = "0.25.14" authors = ["armaniferrante "] -rust-version = "1.62" edition = "2021" repository = "https://github.com/coral-xyz/anchor" description = "Anchor CLI" license = "Apache-2.0" +publish = ["star-atlas"] [[bin]] name = "anchor" @@ -17,31 +17,31 @@ dev = [] default = [] [dependencies] -clap = { version = "3.0.13", features = ["derive"] } +anchor-client = { path = "../client", version = "0.25.14", repository = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.14", repository = "star-atlas" } anyhow = "1.0.32" -syn = { version = "1.0.60", features = ["full", "extra-traits"] } -anchor-lang = { path = "../lang", version = "0.25.0" } -anchor-client = { path = "../client", version = "0.25.0" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.0" } -serde_json = "1.0" -shellexpand = "2.1.0" -toml = "0.5.8" +cargo_toml = "0.10.3" +chrono = "0.4.19" +clap = { version = "3.0.13", features = ["derive"] } +dirs = "3.0" +flate2 = "1.0.19" +heck = "0.3.1" +pathdiff = "0.2.0" +portpicker = "0.1.1" +rand = "0.7.3" +reqwest = { version = "0.11.4", features = ["multipart", "blocking"] } semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } -solana-sdk = "1.10.29" -solana-program = "1.10.29" -solana-client = "1.10.29" +serde_json = "1.0" +shellexpand = "2.1.0" solana-cli-config = "1.10.29" +solana-client = "1.10.29" solana-faucet = "1.10.29" -dirs = "3.0" -heck = "0.3.1" -flate2 = "1.0.19" -rand = "0.7.3" +solana-program = "1.10.29" +solana-sdk = "1.10.29" +syn = { version = "1.0.60", features = ["full", "extra-traits"] } tar = "0.4.35" -reqwest = { version = "0.11.4", features = ["multipart", "blocking"] } tokio = "1.0" -pathdiff = "0.2.0" -cargo_toml = "0.10.3" +toml = "0.5.8" walkdir = "2.3.2" -chrono = "0.4.19" -portpicker = "0.1.1" diff --git a/client/Cargo.toml b/client/Cargo.toml index 2c6d1c7117..233efd3f40 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,22 +1,22 @@ [package] name = "anchor-client" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] -rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "Rust client for Anchor programs" +publish = ["star-atlas"] [features] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.0" } +anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } +solana-account-decoder = "1.10.29" solana-client = "1.10.29" solana-sdk = "1.10.29" -solana-account-decoder = "1.10.29" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 7349eac7e4..14d96efe83 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -2,7 +2,6 @@ name = "example" version = "0.1.0" authors = ["Armani Ferrante "] -rust-version = "1.62" edition = "2021" [workspace] diff --git a/clippy.toml b/clippy.toml index 6bfeada7fa..abe19b3a00 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.62" +msrv = "1.59" diff --git a/docs/src/pages/docs/publishing-source.md b/docs/src/pages/docs/publishing-source.md index d1059c5cc4..22cbcb1ef1 100644 --- a/docs/src/pages/docs/publishing-source.md +++ b/docs/src/pages/docs/publishing-source.md @@ -34,7 +34,7 @@ have an `Anchor.toml` to define the build. An example `Anchor.toml` config looks as follows, ```toml -anchor_version = "0.25.0" +anchor_version = "0.25.14" [workspace] members = ["programs/multisig"] diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml index 24610332de..28c26ed50d 100644 --- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml +++ b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml @@ -2,7 +2,6 @@ name = "basic-0" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml index b0c58db394..f0471eaa24 100644 --- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml +++ b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml @@ -2,7 +2,6 @@ name = "basic-1" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml index 17c55c3517..eede5b3d52 100644 --- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml +++ b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml @@ -2,7 +2,6 @@ name = "basic-2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml index 35ad97a139..505d199c51 100644 --- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml @@ -2,7 +2,6 @@ name = "puppet-master" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml index 85d5a8555f..72f2418edd 100644 --- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml +++ b/examples/tutorial/basic-3/programs/puppet/Cargo.toml @@ -2,7 +2,6 @@ name = "puppet" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml index ab69c4b739..7c80e3ad7a 100644 --- a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml +++ b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml @@ -2,7 +2,6 @@ name = "basic-4" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index f4a39184df..625eed8743 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-lang" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" -rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "Solana Sealevel eDSL" +publish = ["star-atlas"] [features] init-if-needed = ["anchor-derive-accounts/init-if-needed"] @@ -26,19 +26,19 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.0" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.0" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.0" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.0" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.0" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.0" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.0" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.0" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.0" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.14", repository = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.14", repository = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" +bincode = "1.3.3" borsh = "0.9" bytemuck = "1.4.0" solana-program = "1.10.29" thiserror = "1.0.20" -bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index dee564471b..6b69c7e468 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for instruction access control" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,9 +15,9 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" -syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0" } regex = "1.0" +syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 184b518ff9..1ca1f9a6f2 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-account" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an account" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,10 +15,10 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", features = ["hash"] } +anyhow = "1.0.32" +bs58 = "0.4.0" proc-macro2 = "1.0" quote = "1.0" -syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0", features = ["hash"] } rustversion = "1.0.3" -bs58 = "0.4.0" +syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index a5fb8f7a11..a36fe90246 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-constant" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating constant types" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } -anchor-syn = { path = "../../syn", version = "0.25.0" } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 5c5910be34..1c98ad9e61 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-error" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for creating error types" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anchor-syn = { path = "../../syn", version = "0.25.0" } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 07bbbea1c8..ee0f69a603 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-event" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining an event" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,8 +15,8 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas", features = ["hash"] } +anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0", features = ["hash"] } diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 0143c37992..ae8837768f 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-interface" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program interface trait" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,9 +15,9 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anyhow = "1.0.32" +heck = "0.3.2" proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0" } -heck = "0.3.2" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index c03762f9cc..1ee67dae2a 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-program" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor attribute macro for defining a program" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,8 +15,8 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0" } diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 283f17e1d4..000893d1c8 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-attribute-state" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Attribute for defining a program state struct" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -15,8 +15,8 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0" } diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 5dcb3aa143..11c5b302c0 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-derive-accounts" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor Derive macro for accounts" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [lib] proc-macro = true @@ -17,8 +17,8 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] +anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } -anyhow = "1.0.32" -anchor-syn = { path = "../../syn", version = "0.25.0" } diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index c1452dc69c..7e905a4654 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "anchor-syn" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" description = "Anchor syntax parsing and code generation tools" -rust-version = "1.62" edition = "2021" +publish = ["star-atlas"] [features] init-if-needed = [] @@ -17,14 +17,14 @@ anchor-debug = [] seeds = [] [dependencies] -proc-macro2 = { version = "1.0", features=["span-locations"]} -proc-macro2-diagnostics = "0.9" -quote = "1.0" -syn = { version = "1.0.60", features = ["full", "extra-traits", "parsing"] } anyhow = "1.0.32" +bs58 = "0.3.1" heck = "0.3.1" +proc-macro2 = { version = "1.0", features=["span-locations"] } +proc-macro2-diagnostics = "0.9" +quote = "1.0" serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0" sha2 = "0.9.2" +syn = { version = "1.0.60", features = ["full", "extra-traits", "parsing"] } thiserror = "1.0" -bs58 = "0.3.1" diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..dedba31583 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,6 @@ +[toolchain] +# Check https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html +# for valid toolchains. +channel = "nightly-2023-03-22" +components = ["rustfmt", "clippy"] +profile = "minimal" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 4ff38bdd18..3b3eb719ea 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "anchor-spl" -version = "0.25.0" +version = "0.25.14" authors = ["Serum Foundation "] -rust-version = "1.62" edition = "2021" license = "Apache-2.0" description = "CPI clients for SPL programs" +publish = ["star-atlas"] [features] default = ["mint", "token", "associated_token"] @@ -19,9 +19,9 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.0", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas", features = ["derive"] } +mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = "1.10.29" -spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } spl-associated-token-account = { version = "1.1.0", features = ["no-entrypoint"], optional = true } -mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } +spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } diff --git a/tests/auction-house b/tests/auction-house index b73b60e55a..6c59310f0c 160000 --- a/tests/auction-house +++ b/tests/auction-house @@ -1 +1 @@ -Subproject commit b73b60e55a87bda1d2770c7c10db920db9cdb06b +Subproject commit 6c59310f0c5caf3797cd475c5f93fe70878e589c diff --git a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml index e9fca19019..5a1fda4507 100644 --- a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml +++ b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml @@ -2,7 +2,6 @@ name = "bpf-upgradeable-state" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/cashiers-check/programs/cashiers-check/Cargo.toml b/tests/cashiers-check/programs/cashiers-check/Cargo.toml index 165c5f432c..382c652cb6 100644 --- a/tests/cashiers-check/programs/cashiers-check/Cargo.toml +++ b/tests/cashiers-check/programs/cashiers-check/Cargo.toml @@ -2,7 +2,6 @@ name = "cashiers-check" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/cfo/programs/cfo/Cargo.toml b/tests/cfo/programs/cfo/Cargo.toml index 1af78e40d9..ec4dee82f7 100644 --- a/tests/cfo/programs/cfo/Cargo.toml +++ b/tests/cfo/programs/cfo/Cargo.toml @@ -2,7 +2,6 @@ name = "cfo" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/chat/programs/chat/Cargo.toml b/tests/chat/programs/chat/Cargo.toml index 6ba8679d6e..0f95e036b6 100644 --- a/tests/chat/programs/chat/Cargo.toml +++ b/tests/chat/programs/chat/Cargo.toml @@ -2,7 +2,6 @@ name = "chat" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/composite/programs/composite/Cargo.toml b/tests/composite/programs/composite/Cargo.toml index 951b32c884..4f73c5e741 100644 --- a/tests/composite/programs/composite/Cargo.toml +++ b/tests/composite/programs/composite/Cargo.toml @@ -2,7 +2,6 @@ name = "composite" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/custom-coder/Cargo.toml b/tests/custom-coder/programs/custom-coder/Cargo.toml index 166892b1cb..ddb8991895 100644 --- a/tests/custom-coder/programs/custom-coder/Cargo.toml +++ b/tests/custom-coder/programs/custom-coder/Cargo.toml @@ -2,7 +2,6 @@ name = "custom-coder" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/native-system/Cargo.toml b/tests/custom-coder/programs/native-system/Cargo.toml index 86d2efc67c..2816926ce2 100644 --- a/tests/custom-coder/programs/native-system/Cargo.toml +++ b/tests/custom-coder/programs/native-system/Cargo.toml @@ -2,7 +2,6 @@ name = "native-system" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/custom-coder/programs/spl-token/Cargo.toml b/tests/custom-coder/programs/spl-token/Cargo.toml index 99788da163..f4c7c04919 100644 --- a/tests/custom-coder/programs/spl-token/Cargo.toml +++ b/tests/custom-coder/programs/spl-token/Cargo.toml @@ -2,7 +2,6 @@ name = "spl-token" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/errors/programs/errors/Cargo.toml b/tests/errors/programs/errors/Cargo.toml index 8eb7236028..00660adc53 100644 --- a/tests/errors/programs/errors/Cargo.toml +++ b/tests/errors/programs/errors/Cargo.toml @@ -2,7 +2,6 @@ name = "errors" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/escrow/programs/escrow/Cargo.toml b/tests/escrow/programs/escrow/Cargo.toml index 9da089348c..31d1e8d152 100644 --- a/tests/escrow/programs/escrow/Cargo.toml +++ b/tests/escrow/programs/escrow/Cargo.toml @@ -2,7 +2,6 @@ name = "escrow" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/events/programs/events/Cargo.toml b/tests/events/programs/events/Cargo.toml index 62fc6f6d58..2c64a37862 100644 --- a/tests/events/programs/events/Cargo.toml +++ b/tests/events/programs/events/Cargo.toml @@ -2,7 +2,6 @@ name = "events" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/ido-pool/programs/ido-pool/Cargo.toml b/tests/ido-pool/programs/ido-pool/Cargo.toml index 2eac5accee..1523d8cd28 100644 --- a/tests/ido-pool/programs/ido-pool/Cargo.toml +++ b/tests/ido-pool/programs/ido-pool/Cargo.toml @@ -2,7 +2,6 @@ name = "ido-pool" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/interface/programs/counter-auth/Cargo.toml b/tests/interface/programs/counter-auth/Cargo.toml index 0fd7e53b6b..44cb794210 100644 --- a/tests/interface/programs/counter-auth/Cargo.toml +++ b/tests/interface/programs/counter-auth/Cargo.toml @@ -2,7 +2,6 @@ name = "counter-auth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/interface/programs/counter/Cargo.toml b/tests/interface/programs/counter/Cargo.toml index b8a3ed4a2f..5dd70f12a0 100644 --- a/tests/interface/programs/counter/Cargo.toml +++ b/tests/interface/programs/counter/Cargo.toml @@ -2,7 +2,6 @@ name = "counter" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/lockup/programs/lockup/Cargo.toml b/tests/lockup/programs/lockup/Cargo.toml index f7d08c8c65..543c2ad84f 100644 --- a/tests/lockup/programs/lockup/Cargo.toml +++ b/tests/lockup/programs/lockup/Cargo.toml @@ -2,7 +2,6 @@ name = "lockup" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/lockup/programs/registry/Cargo.toml b/tests/lockup/programs/registry/Cargo.toml index b0063e5aab..db6be87702 100644 --- a/tests/lockup/programs/registry/Cargo.toml +++ b/tests/lockup/programs/registry/Cargo.toml @@ -2,7 +2,6 @@ name = "registry" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/idl_doc/Cargo.toml b/tests/misc/programs/idl_doc/Cargo.toml index fb9ce877db..8ee1d8ce61 100644 --- a/tests/misc/programs/idl_doc/Cargo.toml +++ b/tests/misc/programs/idl_doc/Cargo.toml @@ -2,7 +2,6 @@ name = "idl_doc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/misc/Cargo.toml b/tests/misc/programs/misc/Cargo.toml index 50cdd7600b..650e2d2483 100644 --- a/tests/misc/programs/misc/Cargo.toml +++ b/tests/misc/programs/misc/Cargo.toml @@ -2,7 +2,6 @@ name = "misc" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/misc2/Cargo.toml b/tests/misc/programs/misc2/Cargo.toml index da4824bb11..b81566a807 100644 --- a/tests/misc/programs/misc2/Cargo.toml +++ b/tests/misc/programs/misc2/Cargo.toml @@ -2,7 +2,6 @@ name = "misc2" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/misc/programs/shared/Cargo.toml b/tests/misc/programs/shared/Cargo.toml index 9c39f10916..1e41acf6e8 100644 --- a/tests/misc/programs/shared/Cargo.toml +++ b/tests/misc/programs/shared/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.62" edition = "2021" publish = false diff --git a/tests/multisig/programs/multisig/Cargo.toml b/tests/multisig/programs/multisig/Cargo.toml index 99a164258b..97063cfced 100644 --- a/tests/multisig/programs/multisig/Cargo.toml +++ b/tests/multisig/programs/multisig/Cargo.toml @@ -2,7 +2,6 @@ name = "multisig" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/pda-derivation/programs/pda-derivation/Cargo.toml b/tests/pda-derivation/programs/pda-derivation/Cargo.toml index 09c3b500bc..4b93ba8712 100644 --- a/tests/pda-derivation/programs/pda-derivation/Cargo.toml +++ b/tests/pda-derivation/programs/pda-derivation/Cargo.toml @@ -2,7 +2,6 @@ name = "pda-derivation" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/pyth/programs/pyth/Cargo.toml b/tests/pyth/programs/pyth/Cargo.toml index 32989d6b3d..597fdda325 100644 --- a/tests/pyth/programs/pyth/Cargo.toml +++ b/tests/pyth/programs/pyth/Cargo.toml @@ -2,7 +2,6 @@ name = "pyth" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml index 9aea4d798e..1f6dee871e 100644 --- a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml +++ b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml @@ -2,7 +2,6 @@ name = "token-proxy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/swap/programs/swap/Cargo.toml b/tests/swap/programs/swap/Cargo.toml index 374607244b..e28eeb4219 100644 --- a/tests/swap/programs/swap/Cargo.toml +++ b/tests/swap/programs/swap/Cargo.toml @@ -2,7 +2,6 @@ name = "swap" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" publish = false diff --git a/tests/system-accounts/programs/system-accounts/Cargo.toml b/tests/system-accounts/programs/system-accounts/Cargo.toml index dff6b21d6d..cc1a8a9712 100644 --- a/tests/system-accounts/programs/system-accounts/Cargo.toml +++ b/tests/system-accounts/programs/system-accounts/Cargo.toml @@ -2,7 +2,6 @@ name = "system-accounts" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/sysvars/programs/sysvars/Cargo.toml b/tests/sysvars/programs/sysvars/Cargo.toml index 82f9726ac9..46fbfa7705 100644 --- a/tests/sysvars/programs/sysvars/Cargo.toml +++ b/tests/sysvars/programs/sysvars/Cargo.toml @@ -2,7 +2,6 @@ name = "sysvars" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/tictactoe/programs/tictactoe/Cargo.toml b/tests/tictactoe/programs/tictactoe/Cargo.toml index e7a016d8a4..54e26131cc 100644 --- a/tests/tictactoe/programs/tictactoe/Cargo.toml +++ b/tests/tictactoe/programs/tictactoe/Cargo.toml @@ -2,7 +2,6 @@ name = "tictactoe" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/typescript/programs/shared/Cargo.toml b/tests/typescript/programs/shared/Cargo.toml index 9c39f10916..1e41acf6e8 100644 --- a/tests/typescript/programs/shared/Cargo.toml +++ b/tests/typescript/programs/shared/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.62" edition = "2021" publish = false diff --git a/tests/typescript/programs/typescript/Cargo.toml b/tests/typescript/programs/typescript/Cargo.toml index 4475fb56c7..263cd68978 100644 --- a/tests/typescript/programs/typescript/Cargo.toml +++ b/tests/typescript/programs/typescript/Cargo.toml @@ -2,7 +2,6 @@ name = "typescript" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/shared/Cargo.toml b/tests/zero-copy/programs/shared/Cargo.toml index b8fb9b9c18..886aebd65d 100644 --- a/tests/zero-copy/programs/shared/Cargo.toml +++ b/tests/zero-copy/programs/shared/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "shared" version = "0.1.0" -rust-version = "1.62" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tests/zero-copy/programs/zero-copy/Cargo.toml b/tests/zero-copy/programs/zero-copy/Cargo.toml index 242ea322c1..792c39802a 100644 --- a/tests/zero-copy/programs/zero-copy/Cargo.toml +++ b/tests/zero-copy/programs/zero-copy/Cargo.toml @@ -2,7 +2,6 @@ name = "zero-copy" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] diff --git a/tests/zero-copy/programs/zero-cpi/Cargo.toml b/tests/zero-copy/programs/zero-cpi/Cargo.toml index 158dae7226..ab4588adc9 100644 --- a/tests/zero-copy/programs/zero-cpi/Cargo.toml +++ b/tests/zero-copy/programs/zero-cpi/Cargo.toml @@ -2,7 +2,6 @@ name = "zero-cpi" version = "0.1.0" description = "Created with Anchor" -rust-version = "1.62" edition = "2021" [lib] From 45981441919059cc1500a82fc5055c5057a4f59a Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 5 May 2023 17:15:06 -0500 Subject: [PATCH 20/45] Changed repository to registry --- cli/Cargo.toml | 6 +++--- client/Cargo.toml | 2 +- lang/Cargo.toml | 18 +++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 2 +- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 2 +- spl/Cargo.toml | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 94973191ba..7f163ec51b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.14", repository = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.14", repository = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.14", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 233efd3f40..9f980550e3 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 625eed8743..4ea43077df 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.14", repository = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.14", repository = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.14", repository = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.14", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.14", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 6b69c7e468..379b654960 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-access-control" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for instruction access control" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 1ca1f9a6f2..7f646ae893 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-account" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for defining an account" edition = "2021" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index a36fe90246..e59fb7e0d0 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-constant" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for creating constant types" edition = "2021" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 1c98ad9e61..7a119113fd 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-error" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for creating error types" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index ee0f69a603..6bd5d3f4d1 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-event" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for defining an event" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index ae8837768f..d964f4c60a 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-interface" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Attribute for defining a program interface trait" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 1ee67dae2a..62ee37e80e 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-program" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Anchor attribute macro for defining a program" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 000893d1c8..c712414b35 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -2,7 +2,7 @@ name = "anchor-attribute-state" version = "0.25.14" authors = ["Serum Foundation "] -repository = "https://github.com/coral-xyz/anchor" +repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" description = "Attribute for defining a program state struct" edition = "2021" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 11c5b302c0..61a274b35a 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", repository = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 3b3eb719ea..d3a3699cba 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.14", repository = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = "1.10.29" From 28f60caa8a940beec7fbc9f49257a8a881b33915 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 5 May 2023 17:19:27 -0500 Subject: [PATCH 21/45] Added registry --- lang/attribute/account/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 7f646ae893..5c68cd47f8 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" From c83f5362a90420c53683780fb23318ed9829a6db Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 14 Jul 2023 12:00:03 -0500 Subject: [PATCH 22/45] Fixed account close (#12) * Fixed account close * Bumped version --- Cargo.lock | 28 ++++++++++++------------ avm/Cargo.lock | 2 +- avm/Cargo.toml | 2 +- cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- docs/src/pages/docs/publishing-source.md | 2 +- lang/Cargo.toml | 20 ++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/src/accounts/account.rs | 9 +++++--- lang/src/accounts/account_loader.rs | 7 ++++-- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 20 files changed, 65 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba36dd8d08..1cf9183a74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,7 +97,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -109,7 +109,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -122,7 +122,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "proc-macro2 1.0.56", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "proc-macro2 1.0.56", @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-client", "anchor-lang", @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-lang", "anyhow", @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", @@ -246,7 +246,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -268,7 +268,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/avm/Cargo.lock b/avm/Cargo.lock index 1fc2ebc2ae..1fc4072f7a 100644 --- a/avm/Cargo.lock +++ b/avm/Cargo.lock @@ -39,7 +39,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avm" -version = "0.25.14" +version = "0.25.15" dependencies = [ "anyhow", "cfg-if", diff --git a/avm/Cargo.toml b/avm/Cargo.toml index 22d9a15fb8..57c52bc184 100644 --- a/avm/Cargo.toml +++ b/avm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avm" -version = "0.25.14" +version = "0.25.15" edition = "2021" [[bin]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7f163ec51b..8e05f132d4 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.14" +version = "0.25.15" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.14", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.14", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.15", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 9f980550e3..92c012a6c6 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/docs/src/pages/docs/publishing-source.md b/docs/src/pages/docs/publishing-source.md index 22cbcb1ef1..b2a522eea2 100644 --- a/docs/src/pages/docs/publishing-source.md +++ b/docs/src/pages/docs/publishing-source.md @@ -34,7 +34,7 @@ have an `Anchor.toml` to define the build. An example `Anchor.toml` config looks as follows, ```toml -anchor_version = "0.25.14" +anchor_version = "0.25.15" [workspace] members = ["programs/multisig"] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 4ea43077df..b2e3b6473e 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.14", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.14", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.14", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.15", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.15", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 379b654960..f7063e5bb3 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 5c68cd47f8..e39644e581 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index e59fb7e0d0..a354c33861 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 7a119113fd..826972df8c 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 6bd5d3f4d1..f477cfa880 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index d964f4c60a..1bc5d41563 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 62ee37e80e..d36f57c118 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index c712414b35..8f09289b3e 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 61a274b35a..54814d4b40 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.14", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/src/accounts/account.rs b/lang/src/accounts/account.rs index cb0b9afb19..da3ad03148 100644 --- a/lang/src/accounts/account.rs +++ b/lang/src/accounts/account.rs @@ -1,5 +1,6 @@ //! Account container that checks ownership on deserialization. +use crate::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use crate::bpf_writer::BpfWriter; use crate::error::{Error, ErrorCode}; use crate::{ @@ -340,9 +341,11 @@ impl<'info, T: AccountSerialize + AccountDeserialize + Owner + Clone> AccountsEx if &T::owner() == program_id { let info = self.to_account_info(); let mut data = info.try_borrow_mut_data()?; - let dst: &mut [u8] = &mut data; - let mut writer = BpfWriter::new(dst); - self.account.try_serialize(&mut writer)?; + if data[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let dst: &mut [u8] = &mut data; + let mut writer = BpfWriter::new(dst); + self.account.try_serialize(&mut writer)?; + } } Ok(()) } diff --git a/lang/src/accounts/account_loader.rs b/lang/src/accounts/account_loader.rs index 73d8c22a03..6382593eca 100644 --- a/lang/src/accounts/account_loader.rs +++ b/lang/src/accounts/account_loader.rs @@ -6,6 +6,7 @@ use crate::{ Accounts, AccountsClose, AccountsExit, Key, Owner, Result, ToAccountInfo, ToAccountInfos, ToAccountMetas, ZeroCopy, }; +use anchor_lang::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use arrayref::array_ref; use solana_program::account_info::AccountInfo; use solana_program::instruction::AccountMeta; @@ -238,8 +239,10 @@ impl<'info, T: ZeroCopy + Owner> AccountsExit<'info> for AccountLoader<'info, T> fn exit(&self, _program_id: &Pubkey) -> Result<()> { let mut data = self.acc_info.try_borrow_mut_data()?; let dst: &mut [u8] = &mut data; - let mut writer = BpfWriter::new(dst); - writer.write_all(&T::discriminator()).unwrap(); + if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let mut writer = BpfWriter::new(dst); + writer.write_all(&T::discriminator()).unwrap(); + } Ok(()) } } diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 7e905a4654..493a1ad5ac 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index d3a3699cba..d6e80d0923 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.14" +version = "0.25.15" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.14", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = "1.10.29" From cdd26028110ac30b1ad1c8e6127da126e3b825ba Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Fri, 14 Jul 2023 12:02:24 -0500 Subject: [PATCH 23/45] add idl deploy subcommand (#11) --- cli/src/lib.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index c7667b2146..550e4aba50 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -382,6 +382,12 @@ pub enum IdlCommand { #[clap(short, long)] out: Option, }, + /// Sets the IDL for a program, running `init` if necessary. + Deploy { + program_id: Pubkey, + #[clap(short, long)] + filepath: String, + }, } #[derive(Debug, Parser)] @@ -1550,6 +1556,22 @@ fn idl(cfg_override: &ConfigOverride, subcmd: IdlCommand) -> Result<()> { no_docs, } => idl_parse(cfg_override, file, out, out_ts, no_docs), IdlCommand::Fetch { address, out } => idl_fetch(cfg_override, address, out), + IdlCommand::Deploy { + filepath, + program_id, + } => idl_deploy(cfg_override, program_id, filepath), + } +} + +fn idl_deploy( + cfg_override: &ConfigOverride, + program_id: Pubkey, + idl_filepath: String, +) -> Result<()> { + if fetch_idl(cfg_override, program_id).is_ok() { + idl_upgrade(cfg_override, program_id, idl_filepath) + } else { + idl_init(cfg_override, program_id, idl_filepath) } } From 98cbeafb6d62423caff5d0b60c76141ffdc6d99b Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 14 Jul 2023 12:05:44 -0500 Subject: [PATCH 24/45] Fix account close (#13) * Fixed account close * Bumped version * Added account close fix to other accounts --- lang/src/accounts/loader.rs | 7 +++++-- lang/src/accounts/program_account.rs | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lang/src/accounts/loader.rs b/lang/src/accounts/loader.rs index 1d52207d58..69b8737584 100644 --- a/lang/src/accounts/loader.rs +++ b/lang/src/accounts/loader.rs @@ -4,6 +4,7 @@ use crate::{ Accounts, AccountsClose, AccountsExit, Key, Result, ToAccountInfo, ToAccountInfos, ToAccountMetas, ZeroCopy, }; +use anchor_lang::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use arrayref::array_ref; use solana_program::account_info::AccountInfo; use solana_program::instruction::AccountMeta; @@ -181,8 +182,10 @@ impl<'info, T: ZeroCopy> AccountsExit<'info> for Loader<'info, T> { fn exit(&self, _program_id: &Pubkey) -> Result<()> { let mut data = self.acc_info.try_borrow_mut_data()?; let dst: &mut [u8] = &mut data; - let mut writer = BpfWriter::new(dst); - writer.write_all(&T::discriminator()).unwrap(); + if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let mut writer = BpfWriter::new(dst); + writer.write_all(&T::discriminator()).unwrap(); + } Ok(()) } } diff --git a/lang/src/accounts/program_account.rs b/lang/src/accounts/program_account.rs index a36083254d..6c19ec4738 100644 --- a/lang/src/accounts/program_account.rs +++ b/lang/src/accounts/program_account.rs @@ -6,6 +6,7 @@ use crate::{ AccountDeserialize, AccountSerialize, Accounts, AccountsClose, AccountsExit, Key, Result, ToAccountInfo, ToAccountInfos, ToAccountMetas, }; +use anchor_lang::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use solana_program::account_info::AccountInfo; use solana_program::instruction::AccountMeta; use solana_program::pubkey::Pubkey; @@ -101,9 +102,11 @@ impl<'info, T: AccountSerialize + AccountDeserialize + Clone> AccountsExit<'info fn exit(&self, _program_id: &Pubkey) -> Result<()> { let info = self.to_account_info(); let mut data = info.try_borrow_mut_data()?; - let dst: &mut [u8] = &mut data; - let mut writer = BpfWriter::new(dst); - self.inner.account.try_serialize(&mut writer)?; + if data[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let dst: &mut [u8] = &mut data; + let mut writer = BpfWriter::new(dst); + self.inner.account.try_serialize(&mut writer)?; + } Ok(()) } } From 0a18d6eb20cb3f1b7b9bdf6db86497d4761152d1 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 14 Jul 2023 12:16:10 -0500 Subject: [PATCH 25/45] Updated borsh (#14) --- Cargo.lock | 1451 ++++++++++++++++++++++++----------------------- lang/Cargo.toml | 2 +- 2 files changed, 752 insertions(+), 701 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1cf9183a74..a7cc72d5d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] @@ -47,7 +47,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "polyval", "subtle", @@ -60,16 +60,28 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -101,8 +113,8 @@ version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "regex", "syn 1.0.109", ] @@ -114,8 +126,8 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "rustversion", "syn 1.0.109", ] @@ -125,7 +137,7 @@ name = "anchor-attribute-constant" version = "0.25.15" dependencies = [ "anchor-syn", - "proc-macro2 1.0.56", + "proc-macro2 1.0.64", "syn 1.0.109", ] @@ -134,8 +146,8 @@ name = "anchor-attribute-error" version = "0.25.15" dependencies = [ "anchor-syn", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -145,8 +157,8 @@ version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -157,8 +169,8 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -168,8 +180,8 @@ version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -179,8 +191,8 @@ version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -202,7 +214,7 @@ dependencies = [ "portpicker", "rand 0.7.3", "reqwest", - "semver 1.0.17", + "semver", "serde", "serde_json", "shellexpand", @@ -239,8 +251,8 @@ version = "0.25.15" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -260,7 +272,7 @@ dependencies = [ "arrayref", "base64 0.13.1", "bincode", - "borsh", + "borsh 0.10.3", "bytemuck", "solana-program", "thiserror", @@ -285,9 +297,9 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.56", + "proc-macro2 1.0.64", "proc-macro2-diagnostics", - "quote 1.0.26", + "quote 1.0.29", "serde", "serde_json", "sha2 0.9.9", @@ -295,6 +307,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -315,15 +333,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "ark-bn254" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea691771ebbb28aea556c044e2e5c5227398d840cee0c34d4d20fa8eb2689e8c" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" dependencies = [ "ark-ec", "ark-ff", @@ -332,73 +350,105 @@ dependencies = [ [[package]] name = "ark-ec" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea978406c4b1ca13c2db2373b05cc55429c3575b8b21f1b9ee859aa5b03dd42" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ "ark-ff", + "ark-poly", "ark-serialize", "ark-std", "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", "num-traits", "zeroize", ] [[package]] name = "ark-ff" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ "ark-ff-asm", "ark-ff-macros", "ark-serialize", "ark-std", "derivative", + "digest 0.10.7", + "itertools 0.10.5", "num-bigint 0.4.3", "num-traits", "paste", - "rustc_version 0.3.3", + "rustc_version", "zeroize", ] [[package]] name = "ark-ff-asm" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.26", + "quote 1.0.29", "syn 1.0.109", ] [[package]] name = "ark-ff-macros" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ "num-bigint 0.4.3", "num-traits", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + [[package]] name = "ark-serialize" -version = "0.3.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ + "ark-serialize-derive", "ark-std", - "digest 0.9.0", + "digest 0.10.7", + "num-bigint 0.4.3", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 1.0.109", ] [[package]] name = "ark-std" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", "rand 0.8.5", @@ -418,9 +468,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -441,7 +491,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.23", ] [[package]] @@ -450,8 +500,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", "synstructure", ] @@ -462,8 +512,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -473,6 +523,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -498,13 +559,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -538,9 +599,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -574,16 +635,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -617,20 +678,43 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive", + "borsh-derive 0.9.3", "hashbrown 0.11.2", ] +[[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive 0.10.3", + "hashbrown 0.13.2", +] + [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.64", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.56", + "proc-macro2 1.0.64", "syn 1.0.109", ] @@ -640,8 +724,19 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -651,8 +746,19 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -691,9 +797,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bv" @@ -720,9 +826,9 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -775,13 +881,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", @@ -798,16 +904,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "2.34.0" @@ -833,7 +929,7 @@ dependencies = [ "bitflags", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", @@ -848,8 +944,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -862,16 +958,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "combine" version = "3.8.1" @@ -885,17 +971,26 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -926,9 +1021,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -948,9 +1043,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -987,22 +1082,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1039,7 +1134,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -1056,55 +1151,11 @@ dependencies = [ "zeroize", ] -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", -] - [[package]] name = "darling" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c99d16b88c92aef47e58dadd53e87b4bd234c29934947a6cec8b466300f99b" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -1112,34 +1163,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea05d2fcb27b53f7a98faddaf5f2914760330ab7703adfc9df13332b42189f9" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "strsim 0.10.0", - "syn 2.0.15", + "syn 2.0.25", ] [[package]] name = "darling_macro" -version = "0.20.0" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfb82b62b1b8a2a9808fb4caf844ede819a76cfc23b2827d7f94eefb49551eb" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", - "quote 1.0.26", - "syn 2.0.15", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "der" @@ -1176,8 +1227,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -1204,9 +1255,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -1265,13 +1316,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -1335,7 +1386,7 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -1361,34 +1412,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" -dependencies = [ - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -1406,8 +1445,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -1424,6 +1463,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -1468,12 +1513,12 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", - "rustc_version 0.4.0", + "memoffset 0.9.0", + "rustc_version", ] [[package]] @@ -1521,9 +1566,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1582,9 +1627,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -1653,9 +1698,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -1677,9 +1722,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1687,7 +1732,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1709,7 +1754,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -1717,10 +1762,22 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -1747,18 +1804,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "histogram" @@ -1782,7 +1830,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1838,9 +1886,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1888,9 +1936,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1902,12 +1950,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1918,9 +1965,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1953,24 +2000,26 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.17.3" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width", + "equivalent", + "hashbrown 0.14.0", ] [[package]] -name = "inout" -version = "0.1.3" +name = "indicatif" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" dependencies = [ - "generic-array", + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1984,20 +2033,20 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -2019,9 +2068,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jobserver" @@ -2034,9 +2083,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2058,9 +2107,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -2073,19 +2122,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsecp256k1" @@ -2135,26 +2174,17 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2162,12 +2192,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "memchr" @@ -2186,18 +2213,18 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -2247,14 +2274,24 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "miow", + "ntapi", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", ] [[package]] @@ -2263,7 +2300,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24dcb2b0ec0e9246f6f035e0336ba3359c21f6928dfd90281999e2c8e8ab53eb" dependencies = [ - "borsh", + "borsh 0.9.3", "mpl-token-metadata-context-derive", "num-derive", "num-traits", @@ -2277,12 +2314,12 @@ dependencies = [ [[package]] name = "mpl-token-metadata" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e674db8846d4a603454ce9c93233dd8d503d62f2afe1b9e6486ce81e431f89" +checksum = "803d414222c1b648d14559d6d1aaa5fa6f7dfdde3a26c76c331a87d6124aeb5e" dependencies = [ "arrayref", - "borsh", + "borsh 0.9.3", "mpl-token-auth-rules", "mpl-token-metadata-context-derive", "mpl-utils", @@ -2301,18 +2338,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" dependencies = [ - "quote 1.0.26", + "quote 1.0.29", "syn 1.0.109", ] [[package]] name = "mpl-utils" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc48e64c50dba956acb46eec86d6968ef0401ef37031426da479f1f2b592066" +checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" dependencies = [ "arrayref", - "borsh", + "borsh 0.9.3", "solana-program", "spl-token", ] @@ -2337,16 +2374,16 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", "bitflags", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", "pin-utils", + "static_assertions", ] [[package]] @@ -2359,6 +2396,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + [[package]] name = "num" version = "0.2.1" @@ -2411,8 +2457,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] @@ -2460,11 +2506,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -2474,7 +2520,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -2484,11 +2539,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2506,9 +2573,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -2518,9 +2585,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -2537,9 +2604,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -2550,9 +2617,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", @@ -2562,9 +2629,20 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" + +[[package]] +name = "parking_lot" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] [[package]] name = "parking_lot" @@ -2573,27 +2651,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.8", ] [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", + "instant", "libc", "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.45.0", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.1", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pathdiff" @@ -2616,7 +2708,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2630,9 +2722,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "percentage" @@ -2643,21 +2735,11 @@ dependencies = [ "num", ] -[[package]] -name = "pest" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" -dependencies = [ - "thiserror", - "ucd-trie", -] - [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -2678,9 +2760,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plain" @@ -2702,9 +2784,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "0.3.19" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +checksum = "d220334a184db82b31b83f5ff093e3315280fb2b6bbc032022b2304a509aab7a" [[package]] name = "portpicker" @@ -2747,8 +2829,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", "version_check", ] @@ -2759,8 +2841,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "version_check", ] @@ -2775,9 +2857,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -2788,8 +2870,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", "version_check", "yansi", @@ -2865,11 +2947,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ - "proc-macro2 1.0.56", + "proc-macro2 1.0.64", ] [[package]] @@ -2931,7 +3013,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -2982,7 +3064,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.20", + "time 0.3.23", "yasna", ] @@ -3010,16 +3092,28 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.1" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -3028,9 +3122,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -3039,7 +3133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -3147,22 +3241,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver", ] [[package]] @@ -3176,9 +3261,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.15" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags", "errno", @@ -3202,9 +3287,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3214,24 +3299,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "safe-transmute" @@ -3250,11 +3335,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -3263,12 +3348,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "scroll" version = "0.11.0" @@ -3280,13 +3359,13 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -3301,9 +3380,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -3314,72 +3393,54 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -3415,18 +3476,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] name = "serde_yaml" -version = "0.9.21" +version = "0.9.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -3446,7 +3507,7 @@ dependencies = [ "field-offset", "itertools 0.9.0", "num-traits", - "num_enum", + "num_enum 0.5.11", "safe-transmute", "serde", "solana-program", @@ -3464,7 +3525,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3482,13 +3543,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3505,11 +3566,11 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c2bb1a323307527314a36bfb73f24febb08ce2b8a554bf4ffd6f51ad15198c" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -3528,8 +3589,8 @@ version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63927d22a1e8b74bda98cc6e151fcdf178b7abb0dc6c4f81e0bbf5ffe2fc4ec8" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "shank_macro_impl", "syn 1.0.109", ] @@ -3541,8 +3602,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ce03403df682f80f4dc1efafa87a4d0cb89b03726d0565e6364bdca5b9a441" dependencies = [ "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "serde", "syn 1.0.109", ] @@ -3598,9 +3659,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -3614,12 +3675,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e4ac2e5e6474d17f19341df43c62b62ee1e362bae9b06bc30223252dd4a362" +checksum = "f63c62ec28eaf2f4ef06f39d549230699068e9b2171a67a8232e11993ecb86dd" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.2", "bincode", "bs58 0.4.0", "bv", @@ -3638,16 +3699,16 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baac6a0dfc38f64e5e5e178e9eeade05ef1a2c644c95062523c6bc21f19f8866" +checksum = "5ddbc426b2e0443c2e58c0ab721c93a788f0e97eb4f25340e4e50dd1e6978027" dependencies = [ "bincode", "bytemuck", "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3659,9 +3720,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0a43f9bcf2405e50190cf3943046663caae557db9eb71a628f359e3f4f3eea" +checksum = "a19777832c5623c5a1b642f35d847acaf7243124e8f4f300dbe9d387b05b4f78" dependencies = [ "chrono", "clap 2.34.0", @@ -3677,9 +3738,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c79aa0d4d3cef702ca522c1b8dca170eb7137254b6d608f46bcb3a26d6fffd3" +checksum = "eb813240859354ccbfe20005f8784d72676a8212937e42a5e33696932d0cc5c5" dependencies = [ "dirs-next", "lazy_static", @@ -3693,16 +3754,15 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe890559c3d8e29123ed0bfba47d5d714acb1db2e4a9a981c9171960ae01425" +checksum = "c7e3458b0fcf87b14560836a9dc1d0270fe1b4d70425235e91b94a74f4a614f0" dependencies = [ "async-trait", "bincode", - "enum_dispatch", "futures", "futures-util", - "indexmap", + "indexmap 1.9.3", "indicatif", "log", "quinn", @@ -3711,7 +3771,6 @@ dependencies = [ "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-pubsub-client", "solana-quic-client", "solana-rpc-client", @@ -3728,9 +3787,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb520c573b28060cadd8ae0fa6ae116cf74dac01078bc437d8b3e3ab00efd22" +checksum = "1ac78caf77ffe8cc8c108b2e424f5e710f640777f3d78faf2ac7535008a39f5a" dependencies = [ "bincode", "chrono", @@ -3742,20 +3801,20 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c913dfcaf847cecd8866e4aeaa440b34c8a5dae6c1c90b7a8cb3265ff9fc775" +checksum = "964e4b517d80543e9ff0676bb1700f5011e8588795f4e68fb8ab343c87eefad4" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 1.9.3", "log", "rand 0.7.3", "rayon", + "rcgen", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-sdk", "thiserror", "tokio", @@ -3763,9 +3822,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90180632e0528cd46e0ebfaf98977b24fc4593422be9b200e0dfaf97ee09cc7" +checksum = "643af1d1859e8135fad8f152c6b1dbb944fba5a5a5488be428baecc4b08cd4b8" dependencies = [ "bincode", "byteorder", @@ -3787,13 +3846,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f7051cccdf891ac2603cdd295eb651529fe2b678b6b3af60b82dec9a9b3b06" +checksum = "6c272bd949536a92f0fc4d9572bf72b35b3545fc1f6ee031e44f9d075809055d" dependencies = [ - "ahash", + "ahash 0.8.3", "blake3", - "block-buffer 0.9.0", + "block-buffer 0.10.4", "bs58 0.4.0", "bv", "byteorder", @@ -3801,19 +3860,18 @@ dependencies = [ "either", "generic-array", "getrandom 0.1.16", - "hashbrown 0.12.3", "im", "lazy_static", "log", "memmap2", "once_cell", "rand_core 0.6.4", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "solana-frozen-abi-macro", "subtle", "thiserror", @@ -3821,21 +3879,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06395428329810ade1d2518a7e75d8a6f02d01fe548aabb60ff1ba6a2eaebbe5" +checksum = "2f84be4b6dd2cc4e8ad5baa54a23018c8936ec32322ebcffd88355631700292a" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "rustc_version 0.4.0", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "rustc_version", + "syn 2.0.25", ] [[package]] name = "solana-logger" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170714ca3612e4df75f57c2c14c8ab74654b3b66f668986aeed456cedcf24446" +checksum = "b3cb934e8c9015e86cd9c7382ea3083578d1c0813a351644cfdabe3009591b03" dependencies = [ "env_logger", "lazy_static", @@ -3844,9 +3902,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b03528be5a0fbbe4c06a4e1758d155363b51f7c782435b1eb1d4804ab124e3" +checksum = "2a038b70fac9cd5529839efc258e6453f0018d34937a414cd030318916d6dba6" dependencies = [ "log", "solana-sdk", @@ -3854,9 +3912,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5ff9cbbe50e9918576ff46b4e38d9a946c33fc442982ce7ff397a3b851922a" +checksum = "cca14a16eac701e20bda3e103e3d078074a18e83e126f90d918e141379eade8d" dependencies = [ "crossbeam-channel", "gethostname", @@ -3868,9 +3926,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f35dff5b963ec471514e89bd99c7ac43545756221c99b63c2229cf5f37ebb2" +checksum = "509c3d5bc7fe8dbcc25b3238d7cd4a0994c39207260b7b5271a3110ea0ac5f75" dependencies = [ "bincode", "clap 3.2.25", @@ -3890,11 +3948,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d630964a18fb466d79c3f5e191f37083b52b584a3f596e17f4bd41a145254d" +checksum = "3a65308af752a91eddf06c7b7bb5e5d6296ec8cd8de5a1cbebd61f53f45a808c" dependencies = [ - "ahash", + "ahash 0.8.3", "bincode", "bv", "caps", @@ -3917,20 +3975,20 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae9f0fa7db3a4e90fa0df2723ac8cbc042e579cf109cd0380bc5a8c88bed924" +checksum = "476510cb86b9602a793582788f5e23a9cca11929d3880b7427a67142b1e4a430" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", + "ark-serialize", "array-bytes", - "base64 0.13.1", + "base64 0.21.2", "bincode", "bitflags", "blake3", - "borsh", - "borsh-derive", + "borsh 0.10.3", "bs58 0.4.0", "bv", "bytemuck", @@ -3938,28 +3996,28 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.9", + "getrandom 0.2.10", "itertools 0.10.5", "js-sys", "lazy_static", "libc", "libsecp256k1", "log", - "memoffset 0.8.0", + "memoffset 0.9.0", "num-bigint 0.4.3", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.12.1", "rand 0.7.3", "rand_chacha 0.2.2", - "rustc_version 0.4.0", + "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", - "sha3 0.10.7", + "sha2 0.10.7", + "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", @@ -3971,22 +4029,22 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb3250dc9a0abc87693437ae0bb3eb02603396dcf7698c06f77c33b2c0291ca" +checksum = "8311e581ff6406c84ce8ed5d4f1316cf091f723b4823a1ece3e36be6cfb3d69c" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "bincode", "eager", "enum-iterator", "itertools 0.10.5", "libc", - "libloading", "log", "num-derive", "num-traits", + "percentage", "rand 0.7.3", - "rustc_version 0.4.0", + "rustc_version", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3999,15 +4057,15 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e441892b9a00fdceebb0e7eee3226f2f5985a15d081aab1924a298f24cdadb2" +checksum = "5274196946dfef625ec905f7834e7d45b8367364f8eaf99e2c754951da6b972d" dependencies = [ "crossbeam-channel", "futures-util", "log", "reqwest", - "semver 1.0.17", + "semver", "serde", "serde_derive", "serde_json", @@ -4024,9 +4082,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d19f3bd22bd8cef3bd7007e878f8ee1e9534a2b2ad99abc1ac05ed3d9f9bed" +checksum = "3b27ad60edef844f182cd7071e653731ec16b3a319524448935a1183f6b99b80" dependencies = [ "async-mutex", "async-trait", @@ -4037,6 +4095,7 @@ dependencies = [ "quinn", "quinn-proto", "quinn-udp", + "rcgen", "rustls", "solana-connection-cache", "solana-measure", @@ -4045,16 +4104,15 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30893a53deeb0a3e32451f4f7cb063484e1504a06b127c4b40c223ea90093d7b" +checksum = "441bde92d8befd3a698e54c35bff63a396f1e3e5e85754d85a5308a8f5d0328a" dependencies = [ "lazy_static", "num_cpus", @@ -4062,18 +4120,18 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970f142fbf6bda164847f60977ad56adde32cafb7c798d2e005110410754aa85" +checksum = "e1b8820ed78c726c9359248a8fb6456657ce6feca2ff31ffac1286f55bee99e8" dependencies = [ "console", "dialoguer", "log", "num-derive", "num-traits", - "parking_lot", + "parking_lot 0.12.1", "qstring", - "semver 1.0.17", + "semver", "solana-sdk", "thiserror", "uriparse", @@ -4081,18 +4139,18 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075485c8ce9300df10b67f01bb9e9ecb79c4c96c58e4b8aacac20e63c6144149" +checksum = "5baeb95820862d14c1391dfda9a3173b0509f1b17ebd1090b3778fac1743ab69" dependencies = [ "async-trait", - "base64 0.13.1", + "base64 0.21.2", "bincode", "bs58 0.4.0", "indicatif", "log", "reqwest", - "semver 1.0.17", + "semver", "serde", "serde_derive", "serde_json", @@ -4107,15 +4165,15 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0623112b87c9e65ef00538e27203b6129518d40376a4aa2ddc4fae5bf78a8a2c" +checksum = "29009927e289fc5ccd19cec05780dc8465eb65e52922087cf769e57d72c0b7b5" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "bs58 0.4.0", "jsonrpc-core", "reqwest", - "semver 1.0.17", + "semver", "serde", "serde_derive", "serde_json", @@ -4129,9 +4187,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70673c11ff5d831c4e569b41aeb86c0e9c68dba79515b7c6f42b8f842be76fe" +checksum = "df466014e9768f4741be00acea0067bde11a2ec1162a12ebf896960990a2e6b8" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4142,21 +4200,21 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbefda9f9bda78fd9d91ae21c38d9693e94d5979838fb69b70c6addb8dab953f" +checksum = "352b70bb14d8968d5484aa73a1aede3acc816f10a0b264c6599108c5dd6b647b" dependencies = [ "assert_matches", - "base64 0.13.1", + "base64 0.21.2", "bincode", "bitflags", - "borsh", + "borsh 0.10.3", "bs58 0.4.0", "bytemuck", "byteorder", "chrono", "derivation-path", - "digest 0.10.6", + "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", @@ -4169,20 +4227,20 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "num_enum", + "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", - "rustc_version 0.4.0", + "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", "serde_with", - "sha2 0.10.6", - "sha3 0.10.7", + "sha2 0.10.7", + "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -4195,27 +4253,29 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f809319358d5da7c3a0ac08ebf4d87b21170d928dbb7260254e8f3061f7f9e0e" +checksum = "e38a884c027b0759d0969efc1253f3b8798f9d5fbef2eb158cdb70763619d2f3" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "rustversion", - "syn 1.0.109", + "syn 2.0.25", ] [[package]] name = "solana-streamer" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd5b3dad02879b083b7218b9f9596d97cee8deda2b625bff67db95d8920f5f7" +checksum = "13b87bd090a462765b6e3196e6c22cc0edebf8942fb4a6de9a807ce3d8d5d436" dependencies = [ + "async-channel", + "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap", + "indexmap 1.9.3", "itertools 0.10.5", "libc", "log", @@ -4239,9 +4299,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bdd6347caf841a007952c748cd35c3ec8395aa3816ac59b4a9b4c102237de" +checksum = "ab8dc82e52a443249c5b1df3ddd7273306c81fde2c8057cc398e0fbd0fae7a47" dependencies = [ "bincode", "log", @@ -4250,19 +4310,18 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk", - "solana-tpu-client", ] [[package]] name = "solana-tpu-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a7dfa7a85ba000656d91c8847b61f8fa9b8067443449fab8e4c35fe01dee5c" +checksum = "5a09c139e796337646ba4f013a849555f50d35ae7278461d685a429c29f6295f" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 1.9.3", "indicatif", "log", "rand 0.7.3", @@ -4270,7 +4329,6 @@ dependencies = [ "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", @@ -4281,14 +4339,14 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b803e356fc2de0074866a6da007e721c950e754747e761a263b7f9e4c17edefa" +checksum = "284227b302a68b0c384f46cb95e5472d39e7c7094d6079c4e5bd2f133f6920ff" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.2", "bincode", - "borsh", + "borsh 0.9.3", "bs58 0.4.0", "lazy_static", "log", @@ -4307,29 +4365,28 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b0d7efeb2cb7dafbf3b085c895e440b8947fe5def6bdad17ebae9badfdecb0" +checksum = "23aa72c84646a65727b63ff2988147062a792b569591351f06c0e6014ca52de9" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", "solana-sdk", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] [[package]] name = "solana-version" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3df7b4a4dc0a39da78d790845089a8d112fcd6d2d003ae93830387a564cfc5" +checksum = "036b2c0f4b3dfbe48d96c0f5e9be0fadd019bf46327013475bbf3b8ae9870dfe" dependencies = [ "log", - "rustc_version 0.4.0", - "semver 1.0.17", + "rustc_version", + "semver", "serde", "serde_derive", "solana-frozen-abi", @@ -4339,15 +4396,15 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439b8c68f000f8c3713eceabb5cabc8528d276e5bc971c694d4103d4be958ff" +checksum = "85fe8c3382ac0c050c2224037fc8be990f713526e6b136f3a8da9464e2e1a506" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-frozen-abi", @@ -4361,17 +4418,15 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.15.2" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a290aa32014e007b03f952d5b784433d95636c65a3fb08d19dc5658a450941c" +checksum = "02a4c38e1cf77cc046a48d0e515ec3fe654d9c3ba49790523f2d8fd28a5e51d3" dependencies = [ "aes-gcm-siv", - "arrayref", - "base64 0.13.1", + "base64 0.21.2", "bincode", "bytemuck", "byteorder", - "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools 0.10.5", @@ -4392,9 +4447,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.38" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e9e5085099858adba23d0a0b5298da8803f89999cb567ecafab9c916cdf53d" +checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" dependencies = [ "byteorder", "combine", @@ -4427,12 +4482,12 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6" +checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", - "borsh", + "borsh 0.9.3", "num-derive", "num-traits", "solana-program", @@ -4460,22 +4515,22 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "num_enum", + "num_enum 0.5.11", "solana-program", "thiserror", ] [[package]] name = "spl-token-2022" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8" +checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" dependencies = [ "arrayref", "bytemuck", "num-derive", "num-traits", - "num_enum", + "num_enum 0.5.11", "solana-program", "solana-zk-token-sdk", "spl-memo", @@ -4524,19 +4579,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.15" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "unicode-ident", ] @@ -4546,17 +4601,17 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", + "proc-macro2 1.0.64", + "quote 1.0.29", "syn 1.0.109", "unicode-xid 0.2.4", ] [[package]] name = "tar" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ "filetime", "libc", @@ -4565,15 +4620,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4602,22 +4658,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] @@ -4633,9 +4689,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "serde", @@ -4645,15 +4701,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -4694,32 +4750,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" dependencies = [ "autocfg", "bytes", "libc", + "memchr", "mio", "num_cpus", - "parking_lot", + "once_cell", + "parking_lot 0.11.2", "pin-project-lite", "signal-hook-registry", - "socket2", "tokio-macros", - "windows-sys 0.48.0", + "winapi", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 1.0.109", ] [[package]] @@ -4745,9 +4802,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -4772,9 +4829,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" dependencies = [ "bytes", "futures-core", @@ -4795,17 +4852,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "5f8751d9c1b03c6500c387e96f81f815a4f8e72d142d2d4a9ffa6fedd51ddee7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -4818,10 +4875,11 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.38" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4830,20 +4888,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -4882,12 +4940,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - [[package]] name = "unicase" version = "2.6.0" @@ -4905,9 +4957,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" @@ -4994,9 +5046,9 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -5045,11 +5097,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -5073,9 +5124,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5083,24 +5134,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5110,38 +5161,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.26", + "quote 1.0.29", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5203,7 +5254,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -5236,7 +5287,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -5256,9 +5307,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -5355,9 +5406,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -5396,7 +5447,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.23", ] [[package]] @@ -5420,7 +5471,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.20", + "time 0.3.23", ] [[package]] @@ -5438,9 +5489,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 2.0.15", + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 2.0.25", ] [[package]] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index b2e3b6473e..f1859fd803 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -38,7 +38,7 @@ anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.15", regi arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" -borsh = "0.9" +borsh = "0.10.3" bytemuck = "1.4.0" solana-program = "1.10.29" thiserror = "1.0.20" From 490a08154a3abc69b982dd0f2c607a5b700c76f2 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 14 Jul 2023 12:27:49 -0500 Subject: [PATCH 26/45] Update borsh (#15) * Updated borsh * Updated borsh to use 0.9 or 0.10 * Bumped version * Publish script --- Cargo.lock | 28 ++++++++++++------------ avm/Cargo.lock | 2 +- avm/Cargo.toml | 2 +- cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- docs/src/pages/docs/publishing-source.md | 2 +- lang/Cargo.toml | 22 +++++++++---------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/syn/Cargo.toml | 2 +- publish.bash | 16 ++++++++++++++ spl/Cargo.toml | 4 ++-- 19 files changed, 71 insertions(+), 55 deletions(-) create mode 100644 publish.bash diff --git a/Cargo.lock b/Cargo.lock index a7cc72d5d9..b720db22c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,7 +109,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -121,7 +121,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -134,7 +134,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -143,7 +143,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -176,7 +176,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -187,7 +187,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-client", "anchor-lang", @@ -232,7 +232,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-lang", "anyhow", @@ -247,7 +247,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-syn", "anyhow", @@ -258,7 +258,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -292,7 +292,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/avm/Cargo.lock b/avm/Cargo.lock index 1fc4072f7a..e8690bb721 100644 --- a/avm/Cargo.lock +++ b/avm/Cargo.lock @@ -39,7 +39,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "avm" -version = "0.25.15" +version = "0.25.16" dependencies = [ "anyhow", "cfg-if", diff --git a/avm/Cargo.toml b/avm/Cargo.toml index 57c52bc184..6703de49c9 100644 --- a/avm/Cargo.toml +++ b/avm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avm" -version = "0.25.15" +version = "0.25.16" edition = "2021" [[bin]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8e05f132d4..c57513ba3b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.15" +version = "0.25.16" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.15", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.15", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.16", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 92c012a6c6..1c6d44b019 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/docs/src/pages/docs/publishing-source.md b/docs/src/pages/docs/publishing-source.md index b2a522eea2..dfa4c4c526 100644 --- a/docs/src/pages/docs/publishing-source.md +++ b/docs/src/pages/docs/publishing-source.md @@ -34,7 +34,7 @@ have an `Anchor.toml` to define the build. An example `Anchor.toml` config looks as follows, ```toml -anchor_version = "0.25.15" +anchor_version = "0.25.16" [workspace] members = ["programs/multisig"] diff --git a/lang/Cargo.toml b/lang/Cargo.toml index f1859fd803..dc310ca483 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,19 +26,19 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.15", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.15", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.15", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.16", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.16", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" -borsh = "0.10.3" +borsh = ">=0.9,<0.11" bytemuck = "1.4.0" solana-program = "1.10.29" thiserror = "1.0.20" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index f7063e5bb3..6f4778ac9a 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index e39644e581..d508ff8256 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index a354c33861..c9056133bd 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 826972df8c..e5ca5ee734 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index f477cfa880..6c47773582 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 1bc5d41563..3feec28f7d 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index d36f57c118..13538b7029 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 8f09289b3e..7b983e53e9 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 54814d4b40..2385f46ac1 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.15", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 493a1ad5ac..c41a55ae5c 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/publish.bash b/publish.bash new file mode 100644 index 0000000000..6e08e5db30 --- /dev/null +++ b/publish.bash @@ -0,0 +1,16 @@ +#!/bin/bash + +cargp publish -p anchor-syn +cargo publish -p anchor-attribute-access-control +cargo publish -p anchor-attribute-account +cargo publish -p anchor-attribute-constant +cargo publish -p anchor-attribute-error +cargo publish -p anchor-attribute-event +cargo publish -p anchor-attribute-interface +cargo publish -p anchor-attribute-program +cargo publish -p anchor-attribute-state +cargo publish -p anchor-derive-accounts +cargo publish -p anchor-lang +cargo publish -p anchor-spl +cargo publish -p anchor-client +cargo publish -p anchor-cli diff --git a/spl/Cargo.toml b/spl/Cargo.toml index d6e80d0923..04c0017601 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.15" +version = "0.25.16" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.15", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = "1.10.29" From c810aec3faa429413f0e245044c1ac1b7ed33c93 Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Mon, 7 Aug 2023 18:35:21 -0500 Subject: [PATCH 27/45] Refactor to read idl from target folder instead of parsing source (#16) This commit optimizes the method of reading all programs in `config.rs` file. It replaces the old method of parsing the source with reading directly from the target IDL directory. This enables us to run `anchor localnet` without needing the entire program source files. Backport of https://github.com/coral-xyz/anchor/pull/2332 --- cli/src/config.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/cli/src/config.rs b/cli/src/config.rs index 23ae6cb54f..30e899b46b 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -171,20 +171,18 @@ impl WithPath { .collect()) } - // TODO: this should read idl dir instead of parsing source. pub fn read_all_programs(&self) -> Result> { let mut r = vec![]; for path in self.get_program_list()? { let cargo = Manifest::from_path(&path.join("Cargo.toml"))?; let lib_name = cargo.lib_name()?; - let version = cargo.version(); - let idl = anchor_syn::idl::file::parse( - path.join("src/lib.rs"), - version, - self.features.seeds, - false, - false, - )?; + + let idl_filepath = format!("target/idl/{}.json", lib_name); + let idl = fs::read(idl_filepath) + .ok() + .map(|bytes| serde_json::from_reader(&*bytes)) + .transpose()?; + r.push(Program { lib_name, path, From f331c3ff0738812138687dc9837c3f73753ecf1c Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:21:34 -0500 Subject: [PATCH 28/45] Backport IDL Resize Fixes and Bump to 0.25.19 (#18) * Fixed solana version * Bumped version * Made anchor use sbf * Removed extra stuff * Removed submodules * Removed submodules * Bumped version * idl backport * bump to 0.25.19 --------- Co-authored-by: Brett Etter Co-authored-by: Christian Kamm --- .gitmodules | 21 - Cargo.lock | 1047 ++++----------- Cargo.toml | 5 - avm/Cargo.lock | 1174 ----------------- avm/Cargo.toml | 27 - avm/src/anchor/main.rs | 24 - avm/src/lib.rs | 316 ----- avm/src/main.rs | 65 - cli/Cargo.toml | 18 +- cli/src/lib.rs | 96 +- client/Cargo.toml | 10 +- client/example/Cargo.toml | 2 +- examples/tutorial/basic-0/Anchor.toml | 9 - examples/tutorial/basic-0/Cargo.toml | 4 - examples/tutorial/basic-0/client.js | 29 - examples/tutorial/basic-0/package.json | 19 - .../basic-0/programs/basic-0/Cargo.toml | 16 - .../basic-0/programs/basic-0/Xargo.toml | 2 - .../basic-0/programs/basic-0/src/lib.rs | 14 - examples/tutorial/basic-0/tests/basic-0.js | 16 - examples/tutorial/basic-1/Anchor.toml | 9 - examples/tutorial/basic-1/Cargo.toml | 4 - examples/tutorial/basic-1/package.json | 19 - .../basic-1/programs/basic-1/Cargo.toml | 16 - .../basic-1/programs/basic-1/Xargo.toml | 2 - .../basic-1/programs/basic-1/src/lib.rs | 40 - examples/tutorial/basic-1/tests/basic-1.js | 65 - examples/tutorial/basic-2/Anchor.toml | 9 - examples/tutorial/basic-2/Cargo.toml | 4 - examples/tutorial/basic-2/package.json | 19 - .../basic-2/programs/basic-2/Cargo.toml | 16 - .../basic-2/programs/basic-2/Xargo.toml | 2 - .../basic-2/programs/basic-2/src/lib.rs | 43 - examples/tutorial/basic-2/tests/basic-2.js | 48 - examples/tutorial/basic-3/Anchor.toml | 10 - examples/tutorial/basic-3/Cargo.toml | 4 - examples/tutorial/basic-3/package.json | 19 - .../basic-3/programs/puppet-master/Cargo.toml | 17 - .../basic-3/programs/puppet-master/Xargo.toml | 2 - .../basic-3/programs/puppet-master/src/lib.rs | 28 - .../basic-3/programs/puppet/Cargo.toml | 16 - .../basic-3/programs/puppet/Xargo.toml | 2 - .../basic-3/programs/puppet/src/lib.rs | 37 - examples/tutorial/basic-3/tests/basic-3.js | 38 - examples/tutorial/basic-4/Anchor.toml | 9 - examples/tutorial/basic-4/Cargo.toml | 4 - examples/tutorial/basic-4/package.json | 19 - .../basic-4/programs/basic-4/Cargo.toml | 16 - .../basic-4/programs/basic-4/Xargo.toml | 2 - .../basic-4/programs/basic-4/src/lib.rs | 44 - examples/tutorial/basic-4/tests/basic-4.js | 41 - examples/tutorial/package.json | 22 - examples/tutorial/yarn.lock | 1077 --------------- examples/yarn.lock | 4 - lang/Cargo.toml | 24 +- lang/attribute/access-control/Cargo.toml | 4 +- lang/attribute/account/Cargo.toml | 4 +- lang/attribute/constant/Cargo.toml | 4 +- lang/attribute/error/Cargo.toml | 4 +- lang/attribute/event/Cargo.toml | 4 +- lang/attribute/interface/Cargo.toml | 4 +- lang/attribute/program/Cargo.toml | 4 +- lang/attribute/state/Cargo.toml | 4 +- lang/derive/accounts/Cargo.toml | 4 +- lang/src/error.rs | 3 + lang/src/idl.rs | 50 +- lang/syn/Cargo.toml | 2 +- lang/syn/src/codegen/program/handlers.rs | 99 +- publish.bash | 47 +- spl/Cargo.toml | 6 +- tests/anchor-cli-idl/test.sh | 23 +- tests/anchor-cli-idl/tests/idl.ts | 22 + tests/auction-house | 1 - tests/cfo/deps/serum-dex | 1 - tests/cfo/deps/stake | 1 - tests/cfo/deps/swap | 1 - tests/swap/Anchor.toml | 15 - tests/swap/Cargo.toml | 7 - tests/swap/README.md | 34 - tests/swap/deps/serum-dex | 1 - tests/swap/migrations/deploy.js | 12 - tests/swap/package.json | 19 - tests/swap/programs/swap/Cargo.toml | 21 - tests/swap/programs/swap/Xargo.toml | 2 - tests/swap/programs/swap/src/lib.rs | 496 ------- tests/swap/tests/swap.js | 315 ----- tests/swap/tests/utils/index.js | 513 ------- 87 files changed, 611 insertions(+), 5761 deletions(-) delete mode 100644 .gitmodules delete mode 100644 avm/Cargo.lock delete mode 100644 avm/Cargo.toml delete mode 100644 avm/src/anchor/main.rs delete mode 100644 avm/src/lib.rs delete mode 100644 avm/src/main.rs delete mode 100644 examples/tutorial/basic-0/Anchor.toml delete mode 100644 examples/tutorial/basic-0/Cargo.toml delete mode 100644 examples/tutorial/basic-0/client.js delete mode 100644 examples/tutorial/basic-0/package.json delete mode 100644 examples/tutorial/basic-0/programs/basic-0/Cargo.toml delete mode 100644 examples/tutorial/basic-0/programs/basic-0/Xargo.toml delete mode 100644 examples/tutorial/basic-0/programs/basic-0/src/lib.rs delete mode 100644 examples/tutorial/basic-0/tests/basic-0.js delete mode 100644 examples/tutorial/basic-1/Anchor.toml delete mode 100644 examples/tutorial/basic-1/Cargo.toml delete mode 100644 examples/tutorial/basic-1/package.json delete mode 100644 examples/tutorial/basic-1/programs/basic-1/Cargo.toml delete mode 100644 examples/tutorial/basic-1/programs/basic-1/Xargo.toml delete mode 100644 examples/tutorial/basic-1/programs/basic-1/src/lib.rs delete mode 100644 examples/tutorial/basic-1/tests/basic-1.js delete mode 100644 examples/tutorial/basic-2/Anchor.toml delete mode 100644 examples/tutorial/basic-2/Cargo.toml delete mode 100644 examples/tutorial/basic-2/package.json delete mode 100644 examples/tutorial/basic-2/programs/basic-2/Cargo.toml delete mode 100644 examples/tutorial/basic-2/programs/basic-2/Xargo.toml delete mode 100644 examples/tutorial/basic-2/programs/basic-2/src/lib.rs delete mode 100644 examples/tutorial/basic-2/tests/basic-2.js delete mode 100644 examples/tutorial/basic-3/Anchor.toml delete mode 100644 examples/tutorial/basic-3/Cargo.toml delete mode 100644 examples/tutorial/basic-3/package.json delete mode 100644 examples/tutorial/basic-3/programs/puppet-master/Cargo.toml delete mode 100644 examples/tutorial/basic-3/programs/puppet-master/Xargo.toml delete mode 100644 examples/tutorial/basic-3/programs/puppet-master/src/lib.rs delete mode 100644 examples/tutorial/basic-3/programs/puppet/Cargo.toml delete mode 100644 examples/tutorial/basic-3/programs/puppet/Xargo.toml delete mode 100644 examples/tutorial/basic-3/programs/puppet/src/lib.rs delete mode 100644 examples/tutorial/basic-3/tests/basic-3.js delete mode 100644 examples/tutorial/basic-4/Anchor.toml delete mode 100644 examples/tutorial/basic-4/Cargo.toml delete mode 100644 examples/tutorial/basic-4/package.json delete mode 100644 examples/tutorial/basic-4/programs/basic-4/Cargo.toml delete mode 100644 examples/tutorial/basic-4/programs/basic-4/Xargo.toml delete mode 100644 examples/tutorial/basic-4/programs/basic-4/src/lib.rs delete mode 100644 examples/tutorial/basic-4/tests/basic-4.js delete mode 100644 examples/tutorial/package.json delete mode 100644 examples/tutorial/yarn.lock delete mode 100644 examples/yarn.lock mode change 100644 => 100755 publish.bash delete mode 160000 tests/auction-house delete mode 160000 tests/cfo/deps/serum-dex delete mode 160000 tests/cfo/deps/stake delete mode 160000 tests/cfo/deps/swap delete mode 100644 tests/swap/Anchor.toml delete mode 100644 tests/swap/Cargo.toml delete mode 100644 tests/swap/README.md delete mode 160000 tests/swap/deps/serum-dex delete mode 100644 tests/swap/migrations/deploy.js delete mode 100644 tests/swap/package.json delete mode 100644 tests/swap/programs/swap/Cargo.toml delete mode 100644 tests/swap/programs/swap/Xargo.toml delete mode 100644 tests/swap/programs/swap/src/lib.rs delete mode 100644 tests/swap/tests/swap.js delete mode 100644 tests/swap/tests/utils/index.js diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ec5d673782..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,21 +0,0 @@ -[submodule "examples/swap/deps/serum-dex"] - path = tests/swap/deps/serum-dex - url = https://github.com/project-serum/serum-dex -[submodule "examples/cfo/deps/serum-dex"] - path = tests/cfo/deps/serum-dex - url = https://github.com/project-serum/serum-dex -[submodule "examples/cfo/deps/swap"] - path = tests/cfo/deps/swap - url = https://github.com/project-serum/swap.git - branch = armani/cfo -[submodule "examples/cfo/deps/stake"] - path = tests/cfo/deps/stake - url = https://github.com/project-serum/stake.git - branch = armani/cfo -[submodule "examples/permissioned-markets/deps/serum-dex"] - path = tests/permissioned-markets/deps/serum-dex - url = https://github.com/project-serum/serum-dex -[submodule "tests/auction-house"] - path = tests/auction-house - url = https://github.com/armaniferrante/auction-house - branch = armani/pda diff --git a/Cargo.lock b/Cargo.lock index b720db22c0..8bd61b8048 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] @@ -47,7 +47,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.3.0", "ctr", "polyval", "subtle", @@ -65,18 +65,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.10", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.0.2" @@ -109,7 +97,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -121,7 +109,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -134,7 +122,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -143,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -153,7 +141,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -164,7 +152,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -176,7 +164,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -187,7 +175,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -198,7 +186,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-client", "anchor-lang", @@ -232,7 +220,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-lang", "anyhow", @@ -247,7 +235,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-syn", "anyhow", @@ -258,7 +246,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -272,7 +260,7 @@ dependencies = [ "arrayref", "base64 0.13.1", "bincode", - "borsh 0.10.3", + "borsh", "bytemuck", "solana-program", "thiserror", @@ -280,7 +268,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -292,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.16" +version = "0.25.19" dependencies = [ "anyhow", "bs58 0.3.1", @@ -337,129 +325,6 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" -[[package]] -name = "ark-bn254" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - -[[package]] -name = "ark-ec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" -dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", - "itertools 0.10.5", - "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" -dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", - "derivative", - "digest 0.10.7", - "itertools 0.10.5", - "num-bigint 0.4.3", - "num-traits", - "paste", - "rustc_version", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" -dependencies = [ - "quote 1.0.29", - "syn 1.0.109", -] - -[[package]] -name = "ark-ff-macros" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" -dependencies = [ - "num-bigint 0.4.3", - "num-traits", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", -] - -[[package]] -name = "ark-poly" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" -dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", -] - -[[package]] -name = "ark-serialize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" -dependencies = [ - "ark-serialize-derive", - "ark-std", - "digest 0.10.7", - "num-bigint 0.4.3", -] - -[[package]] -name = "ark-serialize-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" -dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", -] - -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - [[package]] name = "arrayref" version = "0.3.7" @@ -472,12 +337,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "asn1-rs" version = "0.5.2" @@ -523,17 +382,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - [[package]] name = "async-compression" version = "0.3.15" @@ -635,9 +483,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", "arrayvec", @@ -678,41 +526,18 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive 0.9.3", + "borsh-derive", "hashbrown 0.11.2", ] -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.13.2", -] - [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.64", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2 1.0.64", "syn 1.0.109", @@ -729,17 +554,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.9.3" @@ -751,17 +565,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", -] - [[package]] name = "brotli" version = "3.3.4" @@ -904,6 +707,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "2.34.0" @@ -958,28 +771,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.15.7" @@ -1021,9 +812,9 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" @@ -1134,7 +925,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] @@ -1151,41 +942,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.64", - "quote 1.0.29", - "strsim 0.10.0", - "syn 2.0.25", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote 1.0.29", - "syn 2.0.25", -] - [[package]] name = "data-encoding" version = "2.4.0" @@ -1221,17 +977,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", -] - [[package]] name = "dialoguer" version = "0.10.4" @@ -1412,19 +1157,31 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" +dependencies = [ + "proc-macro2 1.0.64", + "quote 1.0.29", + "syn 1.0.109", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ + "once_cell", "proc-macro2 1.0.64", "quote 1.0.29", "syn 2.0.25", @@ -1662,6 +1419,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1709,17 +1475,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "goblin" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" -dependencies = [ - "log", - "plain", - "scroll", -] - [[package]] name = "h2" version = "0.3.20" @@ -1739,22 +1494,13 @@ dependencies = [ "tracing", ] -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - [[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash 0.7.6", + "ahash", ] [[package]] @@ -1762,14 +1508,8 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash", ] [[package]] @@ -1957,12 +1697,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.4.0" @@ -2011,15 +1745,23 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.5" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" dependencies = [ "console", - "instant", + "lazy_static", "number_prefix", - "portable-atomic", - "unicode-width", + "regex", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", ] [[package]] @@ -2126,6 +1868,16 @@ version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + [[package]] name = "libsecp256k1" version = "0.6.0" @@ -2174,6 +1926,12 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2213,9 +1971,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -2300,7 +2058,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24dcb2b0ec0e9246f6f035e0336ba3359c21f6928dfd90281999e2c8e8ab53eb" dependencies = [ - "borsh 0.9.3", + "borsh", "mpl-token-metadata-context-derive", "num-derive", "num-traits", @@ -2319,7 +2077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "803d414222c1b648d14559d6d1aaa5fa6f7dfdde3a26c76c331a87d6124aeb5e" dependencies = [ "arrayref", - "borsh 0.9.3", + "borsh", "mpl-token-auth-rules", "mpl-token-metadata-context-derive", "mpl-utils", @@ -2349,7 +2107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" dependencies = [ "arrayref", - "borsh 0.9.3", + "borsh", "solana-program", "spl-token", ] @@ -2374,16 +2132,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", + "memoffset 0.6.5", ] [[package]] @@ -2520,16 +2276,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive", ] [[package]] @@ -2544,18 +2291,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -2764,12 +2499,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "polyval" version = "0.5.3" @@ -2782,12 +2511,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d220334a184db82b31b83f5ff093e3315280fb2b6bbc032022b2304a509aab7a" - [[package]] name = "portpicker" version = "0.1.1" @@ -2888,15 +2611,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.9.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" dependencies = [ "bytes", - "pin-project-lite", + "futures-channel", + "futures-util", + "fxhash", "quinn-proto", "quinn-udp", - "rustc-hash", "rustls", "thiserror", "tokio", @@ -2906,16 +2630,17 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" dependencies = [ "bytes", + "fxhash", "rand 0.8.5", "ring", - "rustc-hash", "rustls", "rustls-native-certs", + "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", @@ -2925,15 +2650,16 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.3.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" dependencies = [ + "futures-util", "libc", "quinn-proto", "socket2", + "tokio", "tracing", - "windows-sys 0.42.0", ] [[package]] @@ -3058,9 +2784,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.10.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", @@ -3154,7 +2880,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "serde", "serde_json", "serde_urlencoded", @@ -3210,31 +2936,16 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" -dependencies = [ - "libc", - "rtoolbox", - "winapi", -] - -[[package]] -name = "rtoolbox" -version = "0.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" dependencies = [ "libc", + "serde", + "serde_json", "winapi", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -3292,11 +3003,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.1", +] + [[package]] name = "rustls-pemfile" version = "1.0.3" @@ -3348,26 +3068,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", -] - [[package]] name = "sct" version = "0.7.0" @@ -3459,39 +3159,16 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", -] - [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap 2.0.0", - "itoa", + "indexmap 1.9.3", "ryu", "serde", - "unsafe-libyaml", + "yaml-rust", ] [[package]] @@ -3507,7 +3184,7 @@ dependencies = [ "field-offset", "itertools 0.9.0", "num-traits", - "num_enum 0.5.11", + "num_enum", "safe-transmute", "serde", "solana-program", @@ -3675,12 +3352,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63c62ec28eaf2f4ef06f39d549230699068e9b2171a67a8232e11993ecb86dd" +checksum = "a6e4e7166dc87b235d087997fd89724d82d0b83f75551fbb1d3d692a47ac237f" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.13.1", "bincode", "bs58 0.4.0", "bv", @@ -3691,6 +3368,7 @@ dependencies = [ "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", + "solana-vote-program", "spl-token", "spl-token-2022", "thiserror", @@ -3699,9 +3377,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ddbc426b2e0443c2e58c0ab721c93a788f0e97eb4f25340e4e50dd1e6978027" +checksum = "8669314c1bab81668baff87db9e81fcf72e15f61d9904e423f13911d8e3949cc" dependencies = [ "bincode", "bytemuck", @@ -3720,9 +3398,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19777832c5623c5a1b642f35d847acaf7243124e8f4f300dbe9d387b05b4f78" +checksum = "d294b68c3a9f67aedde39c799fed85139d779a332280094054446f5b55a2edad" dependencies = [ "chrono", "clap 2.34.0", @@ -3738,9 +3416,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb813240859354ccbfe20005f8784d72676a8212937e42a5e33696932d0cc5c5" +checksum = "073a01cadf661c50373549add14d21436dcfed0fbc88022817481c6a18340fc8" dependencies = [ "dirs-next", "lazy_static", @@ -3754,42 +3432,63 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3458b0fcf87b14560836a9dc1d0270fe1b4d70425235e91b94a74f4a614f0" +checksum = "6b3c55fbbc68dbf7b2df2ba01038d6d2a65522deec3db9c7b15e9c8c1d9dc526" dependencies = [ + "async-mutex", "async-trait", + "base64 0.13.1", "bincode", + "bs58 0.4.0", + "bytes", + "clap 2.34.0", + "crossbeam-channel", + "enum_dispatch", "futures", "futures-util", "indexmap 1.9.3", "indicatif", + "itertools 0.10.5", + "jsonrpc-core", + "lazy_static", "log", "quinn", + "quinn-proto", "rand 0.7.3", + "rand_chacha 0.2.2", "rayon", - "solana-connection-cache", + "reqwest", + "rustls", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-clap-utils", + "solana-faucet", "solana-measure", "solana-metrics", - "solana-pubsub-client", - "solana-quic-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", + "solana-net-utils", "solana-sdk", "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-udp-client", + "solana-transaction-status", + "solana-version", + "solana-vote-program", + "spl-token-2022", "thiserror", "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url", ] [[package]] name = "solana-config-program" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac78caf77ffe8cc8c108b2e424f5e710f640777f3d78faf2ac7535008a39f5a" +checksum = "6faa5fbf80687e39850c3139561b38d35f9d35e248adaccc4b6379ee41846638" dependencies = [ "bincode", "chrono", @@ -3799,32 +3498,11 @@ dependencies = [ "solana-sdk", ] -[[package]] -name = "solana-connection-cache" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964e4b517d80543e9ff0676bb1700f5011e8588795f4e68fb8ab343c87eefad4" -dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap 1.9.3", - "log", - "rand 0.7.3", - "rayon", - "rcgen", - "solana-measure", - "solana-metrics", - "solana-sdk", - "thiserror", - "tokio", -] - [[package]] name = "solana-faucet" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643af1d1859e8135fad8f152c6b1dbb944fba5a5a5488be428baecc4b08cd4b8" +checksum = "9a3084d18786564211573d5043550ea2750c049eaf3c75ae35ed8e9e845a0dda" dependencies = [ "bincode", "byteorder", @@ -3846,13 +3524,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c272bd949536a92f0fc4d9572bf72b35b3545fc1f6ee031e44f9d075809055d" +checksum = "a7a100b7fa8198c20354eb7256c0d9789107d8a62280221f3efe15f7c9dc4cec" dependencies = [ - "ahash 0.8.3", + "ahash", "blake3", - "block-buffer 0.10.4", + "block-buffer 0.9.0", "bs58 0.4.0", "bv", "byteorder", @@ -3860,6 +3538,7 @@ dependencies = [ "either", "generic-array", "getrandom 0.1.16", + "hashbrown 0.12.3", "im", "lazy_static", "log", @@ -3879,21 +3558,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84be4b6dd2cc4e8ad5baa54a23018c8936ec32322ebcffd88355631700292a" +checksum = "1f527f44601b35dd67d11bc72f2f7512976a466f9304ef574b87dac83ced8a42" dependencies = [ "proc-macro2 1.0.64", "quote 1.0.29", "rustc_version", - "syn 2.0.25", + "syn 1.0.109", ] [[package]] name = "solana-logger" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3cb934e8c9015e86cd9c7382ea3083578d1c0813a351644cfdabe3009591b03" +checksum = "8632c8bc480bb5615b70a18b807ede73024aebc7761503ff86a70b7f4906ae47" dependencies = [ "env_logger", "lazy_static", @@ -3902,9 +3581,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a038b70fac9cd5529839efc258e6453f0018d34937a414cd030318916d6dba6" +checksum = "2a3d09e890127454f43ffc37a6e23a375fe86c5159c4e5d4767d446ddb7e93a3" dependencies = [ "log", "solana-sdk", @@ -3912,9 +3591,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca14a16eac701e20bda3e103e3d078074a18e83e126f90d918e141379eade8d" +checksum = "185128a041b4c1eaeec7f2034673ce89f99ee364fcb4405313edb1bc26ac95dd" dependencies = [ "crossbeam-channel", "gethostname", @@ -3926,9 +3605,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509c3d5bc7fe8dbcc25b3238d7cd4a0994c39207260b7b5271a3110ea0ac5f75" +checksum = "16497e2cc753a0a35fb34c73846495fa21ba04a4e64cb92d818c4cb31c935fcc" dependencies = [ "bincode", "clap 3.2.25", @@ -3948,11 +3627,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a65308af752a91eddf06c7b7bb5e5d6296ec8cd8de5a1cbebd61f53f45a808c" +checksum = "edc65488c030174215a0176e44f889aed937c172ea1886c878f25ad7ce63f189" dependencies = [ - "ahash 0.8.3", + "ahash", "bincode", "bv", "caps", @@ -3975,20 +3654,16 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476510cb86b9602a793582788f5e23a9cca11929d3880b7427a67142b1e4a430" +checksum = "51ad5f48743ce505f6139a07e20aecdc689def12da7230fed661c2073ab97df8" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "array-bytes", - "base64 0.21.2", + "base64 0.13.1", "bincode", "bitflags", "blake3", - "borsh 0.10.3", + "borsh", + "borsh-derive", "bs58 0.4.0", "bv", "bytemuck", @@ -4003,8 +3678,7 @@ dependencies = [ "libc", "libsecp256k1", "log", - "memoffset 0.9.0", - "num-bigint 0.4.3", + "memoffset 0.6.5", "num-derive", "num-traits", "parking_lot 0.12.1", @@ -4029,20 +3703,20 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8311e581ff6406c84ce8ed5d4f1316cf091f723b4823a1ece3e36be6cfb3d69c" +checksum = "e837e539fee15e553bfc6e041bcfbc1113db6e437c21f0319536c4ea1621b884" dependencies = [ - "base64 0.21.2", + "base64 0.13.1", "bincode", "eager", "enum-iterator", "itertools 0.10.5", "libc", + "libloading", "log", "num-derive", "num-traits", - "percentage", "rand 0.7.3", "rustc_version", "serde", @@ -4051,68 +3725,14 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk", - "solana_rbpf", - "thiserror", -] - -[[package]] -name = "solana-pubsub-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5274196946dfef625ec905f7834e7d45b8367364f8eaf99e2c754951da6b972d" -dependencies = [ - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", -] - -[[package]] -name = "solana-quic-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27ad60edef844f182cd7071e653731ec16b3a319524448935a1183f6b99b80" -dependencies = [ - "async-mutex", - "async-trait", - "futures", - "itertools 0.10.5", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "quinn-udp", - "rcgen", - "rustls", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", "thiserror", - "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441bde92d8befd3a698e54c35bff63a396f1e3e5e85754d85a5308a8f5d0328a" +checksum = "1aa7a1bc3d3e611952e10c9447094f5c2816b5bb8122c6710a6f28395595a671" dependencies = [ "lazy_static", "num_cpus", @@ -4120,9 +3740,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b8820ed78c726c9359248a8fb6456657ce6feca2ff31ffac1286f55bee99e8" +checksum = "39e4fb5902f71b3965b75a6418874f1d2bff525e4e49108e5f2ea174a5213b66" dependencies = [ "console", "dialoguer", @@ -4137,78 +3757,17 @@ dependencies = [ "uriparse", ] -[[package]] -name = "solana-rpc-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baeb95820862d14c1391dfda9a3173b0509f1b17ebd1090b3778fac1743ab69" -dependencies = [ - "async-trait", - "base64 0.21.2", - "bincode", - "bs58 0.4.0", - "indicatif", - "log", - "reqwest", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", -] - -[[package]] -name = "solana-rpc-client-api" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29009927e289fc5ccd19cec05780dc8465eb65e52922087cf769e57d72c0b7b5" -dependencies = [ - "base64 0.21.2", - "bs58 0.4.0", - "jsonrpc-core", - "reqwest", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-rpc-client-nonce-utils" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df466014e9768f4741be00acea0067bde11a2ec1162a12ebf896960990a2e6b8" -dependencies = [ - "clap 2.34.0", - "solana-clap-utils", - "solana-rpc-client", - "solana-sdk", - "thiserror", -] - [[package]] name = "solana-sdk" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352b70bb14d8968d5484aa73a1aede3acc816f10a0b264c6599108c5dd6b647b" +checksum = "1c515a5a5a5cdc115044c33959eb4d091680f5e7ca8be9eb5218fb0c21bf3568" dependencies = [ "assert_matches", - "base64 0.21.2", + "base64 0.13.1", "bincode", "bitflags", - "borsh 0.10.3", + "borsh", "bs58 0.4.0", "bytemuck", "byteorder", @@ -4227,7 +3786,6 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", "rand 0.7.3", @@ -4238,7 +3796,6 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "serde_with", "sha2 0.10.7", "sha3 0.10.8", "solana-frozen-abi", @@ -4253,25 +3810,23 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38a884c027b0759d0969efc1253f3b8798f9d5fbef2eb158cdb70763619d2f3" +checksum = "4bbc3ab3070c090e1a18fd5a0a07d729d0db2bc8524414dc3e16504286d38049" dependencies = [ "bs58 0.4.0", "proc-macro2 1.0.64", "quote 1.0.29", "rustversion", - "syn 2.0.25", + "syn 1.0.109", ] [[package]] name = "solana-streamer" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b87bd090a462765b6e3196e6c22cc0edebf8942fb4a6de9a807ce3d8d5d436" +checksum = "c54279b5018a6e9a98e4b4e5dad87953e64359a6f9ce3715ffcdee0691885b88" dependencies = [ - "async-channel", - "bytes", "crossbeam-channel", "futures-util", "histogram", @@ -4284,8 +3839,6 @@ dependencies = [ "percentage", "pkcs8", "quinn", - "quinn-proto", - "quinn-udp", "rand 0.7.3", "rcgen", "rustls", @@ -4297,56 +3850,16 @@ dependencies = [ "x509-parser", ] -[[package]] -name = "solana-thin-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8dc82e52a443249c5b1df3ddd7273306c81fde2c8057cc398e0fbd0fae7a47" -dependencies = [ - "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", -] - -[[package]] -name = "solana-tpu-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c139e796337646ba4f013a849555f50d35ae7278461d685a429c29f6295f" -dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap 1.9.3", - "indicatif", - "log", - "rand 0.7.3", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", -] - [[package]] name = "solana-transaction-status" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284227b302a68b0c384f46cb95e5472d39e7c7094d6079c4e5bd2f133f6920ff" +checksum = "8e6fbba26070920a1d25be8b3a2835df337ddcb5df1e65e4bbed48a019604377" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.13.1", "bincode", - "borsh 0.9.3", + "borsh", "bs58 0.4.0", "lazy_static", "log", @@ -4355,7 +3868,10 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-address-lookup-table-program", + "solana-measure", + "solana-metrics", "solana-sdk", + "solana-vote-program", "spl-associated-token-account", "spl-memo", "spl-token", @@ -4363,26 +3879,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "solana-udp-client" -version = "1.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa72c84646a65727b63ff2988147062a792b569591351f06c0e6014ca52de9" -dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - [[package]] name = "solana-version" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036b2c0f4b3dfbe48d96c0f5e9be0fadd019bf46327013475bbf3b8ae9870dfe" +checksum = "122eccec6f9124b9234fde0ba6da263198f8e403f58e6535cd342f5fd3bd6c76" dependencies = [ "log", "rustc_version", @@ -4396,9 +3897,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fe8c3382ac0c050c2224037fc8be990f713526e6b136f3a8da9464e2e1a506" +checksum = "3edcb5a3ff3a8e78441badd1f21d2d6244e33497ee341b1bcafea768c6b501e6" dependencies = [ "bincode", "log", @@ -4410,7 +3911,6 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", - "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", @@ -4418,15 +3918,17 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.3" +version = "1.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a4c38e1cf77cc046a48d0e515ec3fe654d9c3ba49790523f2d8fd28a5e51d3" +checksum = "5d51d131cdefcb621a8034321ce487c4f788e813f81ce81e4f65eed8d4b4f2aa" dependencies = [ "aes-gcm-siv", - "base64 0.21.2", + "arrayref", + "base64 0.13.1", "bincode", "bytemuck", "byteorder", + "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools 0.10.5", @@ -4445,25 +3947,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "solana_rbpf" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" -dependencies = [ - "byteorder", - "combine", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi", -] - [[package]] name = "spin" version = "0.5.2" @@ -4487,7 +3970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", - "borsh 0.9.3", + "borsh", "num-derive", "num-traits", "solana-program", @@ -4515,7 +3998,7 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "num_enum 0.5.11", + "num_enum", "solana-program", "thiserror", ] @@ -4530,7 +4013,7 @@ dependencies = [ "bytemuck", "num-derive", "num-traits", - "num_enum 0.5.11", + "num_enum", "solana-program", "solana-zk-token-sdk", "spl-memo", @@ -4880,7 +4363,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5004,21 +4486,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - [[package]] name = "unsize" version = "1.1.0" @@ -5079,12 +4546,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "walkdir" version = "2.3.3" @@ -5257,21 +4718,6 @@ dependencies = [ "windows-targets 0.48.1", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -5459,6 +4905,15 @@ dependencies = [ "libc", ] +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "yansi" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index f2de96cf89..ce17ba7cf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,3 @@ members = [ "lang/syn", "spl", ] -exclude = [ - "tests/swap/deps/serum-dex", - "tests/cfo/deps/serum-dex", - "tests/permissioned-markets/deps/serum-dex", -] diff --git a/avm/Cargo.lock b/avm/Cargo.lock deleted file mode 100644 index e8690bb721..0000000000 --- a/avm/Cargo.lock +++ /dev/null @@ -1,1174 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anyhow" -version = "1.0.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a99269dff3bc004caa411f38845c20303f1e393ca2bd6581576fa3a7f59577d" - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "avm" -version = "0.25.16" -dependencies = [ - "anyhow", - "cfg-if", - "clap", - "dirs", - "once_cell", - "reqwest", - "semver", - "serde", - "serde_json", - "tempfile", - "thiserror", -] - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bumpalo" -version = "3.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f1fea81f183005ced9e59cdb01737ef2423956dac5a6d731b06b2ecfaa3467" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd1122e63869df2cb309f449da1ad54a7c6dfeb7c7e6ccd8e0825d9eb93bb72" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "encoding_rs" -version = "0.8.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "h2" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "js-sys" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mio" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "native-tls" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" - -[[package]] -name = "openssl" -version = "0.10.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_str_bytes" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pin-project-lite" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "ryu" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi", -] - -[[package]] -name = "security-framework" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" - -[[package]] -name = "serde" -version = "1.0.136" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.136" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "slab" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" - -[[package]] -name = "socket2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" - -[[package]] -name = "thiserror" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinyvec" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" -dependencies = [ - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "winapi", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "unicode-bidi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasm-bindgen" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" - -[[package]] -name = "web-sys" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi", -] diff --git a/avm/Cargo.toml b/avm/Cargo.toml deleted file mode 100644 index 6703de49c9..0000000000 --- a/avm/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "avm" -version = "0.25.16" -edition = "2021" - -[[bin]] -name = "avm" -path = "src/main.rs" - -[[bin]] -name = "anchor" -path = "src/anchor/main.rs" - -[dependencies] -clap = { version = "3.0.13", features = [ "derive" ]} -cfg-if = "1.0.0" -anyhow = "1.0.32" -dirs = "1.0.5" -semver = "1.0.4" -serde = { version = "1.0.136", features = [ "derive" ]} -serde_json = "1.0.78" -thiserror = "1.0.30" -once_cell = { version = "1.8.0" } -reqwest = { version = "0.11.9", features = ['blocking', 'json'] } -tempfile = "3.3.0" - -[workspace] diff --git a/avm/src/anchor/main.rs b/avm/src/anchor/main.rs deleted file mode 100644 index 5b6d2e956c..0000000000 --- a/avm/src/anchor/main.rs +++ /dev/null @@ -1,24 +0,0 @@ -use std::{env, fs, process::Command}; - -fn main() -> anyhow::Result<()> { - let args = env::args().skip(1).collect::>(); - - let version = avm::current_version() - .map_err(|_e| anyhow::anyhow!("Anchor version not set. Please run `avm use latest`."))?; - - let binary_path = avm::version_binary_path(&version); - if fs::metadata(&binary_path).is_err() { - anyhow::bail!( - "anchor-cli {} not installed. Please run `avm use {}`.", - version, - version - ); - } - Command::new(binary_path) - .args(args) - .spawn()? - .wait_with_output() - .expect("Failed to run anchor-cli"); - - Ok(()) -} diff --git a/avm/src/lib.rs b/avm/src/lib.rs deleted file mode 100644 index 038d6506d3..0000000000 --- a/avm/src/lib.rs +++ /dev/null @@ -1,316 +0,0 @@ -use anyhow::{anyhow, Result}; -use once_cell::sync::Lazy; -use reqwest::header::USER_AGENT; -use semver::Version; -use serde::{de, Deserialize}; -use std::fs; -use std::io::Write; -use std::path::PathBuf; -use std::process::Stdio; - -/// Storage directory for AVM, ~/.avm -pub static AVM_HOME: Lazy = Lazy::new(|| { - cfg_if::cfg_if! { - if #[cfg(test)] { - let dir = tempfile::tempdir().expect("Could not create temporary directory"); - dir.path().join(".avm") - } else { - let mut user_home = dirs::home_dir().expect("Could not find home directory"); - user_home.push(".avm"); - user_home - } - } -}); - -/// Path to the current version file ~/.avm/.version -pub fn current_version_file_path() -> PathBuf { - let mut current_version_file_path = AVM_HOME.to_path_buf(); - current_version_file_path.push(".version"); - current_version_file_path -} - -/// Read the current version from the version file -pub fn current_version() -> Result { - let v = fs::read_to_string(current_version_file_path().as_path()) - .map_err(|e| anyhow!("Could not read version file: {}", e))?; - Version::parse(v.trim_end_matches('\n').to_string().as_str()) - .map_err(|e| anyhow!("Could not parse version file: {}", e)) -} - -/// Path to the binary for the given version -pub fn version_binary_path(version: &Version) -> PathBuf { - let mut version_path = AVM_HOME.join("bin"); - version_path.push(format!("anchor-{}", version)); - version_path -} - -/// Update the current version to a new version -pub fn use_version(version: &Version) -> Result<()> { - let installed_versions = read_installed_versions(); - // Make sure the requested version is installed - if !installed_versions.contains(version) { - if let Ok(current) = current_version() { - println!( - "Version {} is not installed, staying on version {}.", - version, current - ); - } else { - println!("Version {} is not installed, no current version.", version); - } - - return Err(anyhow!( - "You need to run 'avm install {}' to install it before using it.", - version - )); - } - - let mut current_version_file = fs::File::create(current_version_file_path().as_path())?; - current_version_file.write_all(version.to_string().as_bytes())?; - println!("Now using anchor version {}.", current_version()?); - Ok(()) -} - -/// Update to the latest version -pub fn update() -> Result<()> { - // Find last stable version - let version = &get_latest_version(); - - install_version(version, false) -} - -/// Install a version of anchor-cli -pub fn install_version(version: &Version, force: bool) -> Result<()> { - // If version is already installed we ignore the request. - let installed_versions = read_installed_versions(); - if installed_versions.contains(version) && !force { - println!("Version {} is already installed", version); - return Ok(()); - } - - let exit = std::process::Command::new("cargo") - .args(&[ - "install", - "--git", - "https://github.com/coral-xyz/anchor", - "--tag", - &format!("v{}", &version), - "anchor-cli", - "--locked", - "--root", - AVM_HOME.to_str().unwrap(), - ]) - .stdout(Stdio::inherit()) - .stderr(Stdio::inherit()) - .output() - .map_err(|e| { - anyhow::format_err!("Cargo install for {} failed: {}", version, e.to_string()) - })?; - if !exit.status.success() { - return Err(anyhow!( - "Failed to install {}, is it a valid version?", - version - )); - } - fs::rename( - &AVM_HOME.join("bin").join("anchor"), - &AVM_HOME.join("bin").join(format!("anchor-{}", version)), - )?; - // If .version file is empty or not parseable, write the newly installed version to it - if current_version().is_err() { - let mut current_version_file = fs::File::create(current_version_file_path().as_path())?; - current_version_file.write_all(version.to_string().as_bytes())?; - } - - use_version(version) -} - -/// Remove an installed version of anchor-cli -pub fn uninstall_version(version: &Version) -> Result<()> { - let version_path = AVM_HOME.join("bin").join(format!("anchor-{}", version)); - if !version_path.exists() { - return Err(anyhow!("anchor-cli {} is not installed", version)); - } - if version == ¤t_version().unwrap() { - return Err(anyhow!("anchor-cli {} is currently in use", version)); - } - fs::remove_file(version_path.as_path())?; - Ok(()) -} - -/// Ensure the users home directory is setup with the paths required by AVM. -pub fn ensure_paths() { - let home_dir = AVM_HOME.to_path_buf(); - if !home_dir.as_path().exists() { - fs::create_dir_all(home_dir.clone()).expect("Could not create .avm directory"); - } - let bin_dir = home_dir.join("bin"); - if !bin_dir.as_path().exists() { - fs::create_dir_all(bin_dir).expect("Could not create .avm/bin directory"); - } - if !current_version_file_path().exists() { - fs::File::create(current_version_file_path()).expect("Could not create .version file"); - } -} - -/// Retrieve a list of installable versions of anchor-cli using the GitHub API and tags on the Anchor -/// repository. -pub fn fetch_versions() -> Vec { - #[derive(Deserialize)] - struct Release { - #[serde(rename = "name", deserialize_with = "version_deserializer")] - version: semver::Version, - } - - fn version_deserializer<'de, D>(deserializer: D) -> Result - where - D: de::Deserializer<'de>, - { - let s: &str = de::Deserialize::deserialize(deserializer)?; - Version::parse(s.trim_start_matches('v')).map_err(de::Error::custom) - } - - let client = reqwest::blocking::Client::new(); - let versions: Vec = client - .get("https://api.github.com/repos/coral-xyz/anchor/tags") - .header(USER_AGENT, "avm https://github.com/coral-xyz/anchor") - .send() - .unwrap() - .json() - .unwrap(); - versions.into_iter().map(|r| r.version).collect() -} - -/// Print available versions and flags indicating installed, current and latest -pub fn list_versions() -> Result<()> { - let installed_versions = read_installed_versions(); - - let mut available_versions = fetch_versions(); - // Reverse version list so latest versions are printed last - available_versions.reverse(); - - available_versions.iter().enumerate().for_each(|(i, v)| { - print!("{}", v); - let mut flags = vec![]; - if i == available_versions.len() - 1 { - flags.push("latest"); - } - if installed_versions.contains(v) { - flags.push("installed"); - } - if current_version().is_ok() && current_version().unwrap() == v.clone() { - flags.push("current"); - } - if flags.is_empty() { - println!(); - } else { - println!("\t({})", flags.join(", ")); - } - }); - - Ok(()) -} - -pub fn get_latest_version() -> semver::Version { - let available_versions = fetch_versions(); - available_versions.first().unwrap().clone() -} - -/// Read the installed anchor-cli versions by reading the binaries in the AVM_HOME/bin directory. -pub fn read_installed_versions() -> Vec { - let home_dir = AVM_HOME.to_path_buf(); - let mut versions = vec![]; - for file in fs::read_dir(&home_dir.join("bin")).unwrap() { - let file_name = file.unwrap().file_name(); - // Match only things that look like anchor-* - if file_name.to_str().unwrap().starts_with("anchor-") { - let version = file_name - .to_str() - .unwrap() - .trim_start_matches("anchor-") - .parse::() - .unwrap(); - versions.push(version); - } - } - - versions -} - -#[cfg(test)] -mod tests { - use crate::*; - use semver::Version; - use std::fs; - use std::io::Write; - - #[test] - fn test_ensure_paths() { - ensure_paths(); - assert!(AVM_HOME.exists()); - let bin_dir = AVM_HOME.join("bin"); - assert!(bin_dir.exists()); - let current_version_file = AVM_HOME.join(".version"); - assert!(current_version_file.exists()); - } - - #[test] - fn test_current_version_file_path() { - ensure_paths(); - assert!(current_version_file_path().exists()); - } - - #[test] - fn test_version_binary_path() { - assert!( - version_binary_path(&Version::parse("0.18.2").unwrap()) - == AVM_HOME.join("bin/anchor-0.18.2") - ); - } - - #[test] - fn test_current_version() { - ensure_paths(); - let mut current_version_file = - fs::File::create(current_version_file_path().as_path()).unwrap(); - current_version_file.write_all("0.18.2".as_bytes()).unwrap(); - // Sync the file to disk before the read in current_version() to - // mitigate the read not seeing the written version bytes. - current_version_file.sync_all().unwrap(); - assert!(current_version().unwrap() == Version::parse("0.18.2").unwrap()); - } - - #[test] - #[should_panic(expected = "anchor-cli 0.18.1 is not installed")] - fn test_uninstall_non_installed_version() { - uninstall_version(&Version::parse("0.18.1").unwrap()).unwrap(); - } - - #[test] - #[should_panic(expected = "anchor-cli 0.18.2 is currently in use")] - fn test_uninstalled_in_use_version() { - ensure_paths(); - let version = Version::parse("0.18.2").unwrap(); - let mut current_version_file = - fs::File::create(current_version_file_path().as_path()).unwrap(); - current_version_file.write_all("0.18.2".as_bytes()).unwrap(); - // Sync the file to disk before the read in current_version() to - // mitigate the read not seeing the written version bytes. - current_version_file.sync_all().unwrap(); - // Create a fake binary for anchor-0.18.2 in the bin directory - fs::File::create(version_binary_path(&version)).unwrap(); - uninstall_version(&version).unwrap(); - } - - #[test] - fn test_read_installed_versions() { - ensure_paths(); - let version = Version::parse("0.18.2").unwrap(); - // Create a fake binary for anchor-0.18.2 in the bin directory - fs::File::create(version_binary_path(&version)).unwrap(); - let expected = vec![version]; - assert!(read_installed_versions() == expected); - // Should ignore this file because its not anchor- prefixed - fs::File::create(AVM_HOME.join("bin").join("garbage").as_path()).unwrap(); - assert!(read_installed_versions() == expected); - } -} diff --git a/avm/src/main.rs b/avm/src/main.rs deleted file mode 100644 index 97c53a0bcb..0000000000 --- a/avm/src/main.rs +++ /dev/null @@ -1,65 +0,0 @@ -use anyhow::{Error, Result}; -use clap::{Parser, Subcommand}; -use semver::Version; - -pub const VERSION: &str = env!("CARGO_PKG_VERSION"); - -#[derive(Parser)] -#[clap(name = "avm", about = "Anchor version manager", version)] -pub struct Cli { - #[clap(subcommand)] - command: Commands, -} - -#[derive(Subcommand)] -pub enum Commands { - #[clap(about = "Use a specific version of Anchor")] - Use { - #[clap(parse(try_from_str = parse_version))] - version: Version, - }, - #[clap(about = "Install a version of Anchor")] - Install { - #[clap(parse(try_from_str = parse_version))] - version: Version, - #[clap(long)] - /// Flag to force installation even if the version - /// is already installed - force: bool, - }, - #[clap(about = "Uninstall a version of Anchor")] - Uninstall { - #[clap(parse(try_from_str = parse_version))] - version: Version, - }, - #[clap(about = "List available versions of Anchor")] - List {}, - #[clap(about = "Update to the latest Anchor version")] - Update {}, -} - -// If `latest` is passed use the latest available version. -fn parse_version(version: &str) -> Result { - if version == "latest" { - Ok(avm::get_latest_version()) - } else { - Version::parse(version).map_err(|e| anyhow::anyhow!(e)) - } -} -pub fn entry(opts: Cli) -> Result<()> { - match opts.command { - Commands::Use { version } => avm::use_version(&version), - Commands::Install { version, force } => avm::install_version(&version, force), - Commands::Uninstall { version } => avm::uninstall_version(&version), - Commands::List {} => avm::list_versions(), - Commands::Update {} => avm::update(), - } -} - -fn main() -> Result<()> { - // Make sure the user's home directory is setup with the paths required by AVM. - avm::ensure_paths(); - - let opt = Cli::parse(); - entry(opt) -} diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c57513ba3b..10ccac4971 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.16" +version = "0.25.19" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.16", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.16", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.19", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" @@ -35,11 +35,11 @@ semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0" shellexpand = "2.1.0" -solana-cli-config = "1.10.29" -solana-client = "1.10.29" -solana-faucet = "1.10.29" -solana-program = "1.10.29" -solana-sdk = "1.10.29" +solana-cli-config = ">=1.10.29,<1.15" +solana-client = ">=1.10.29,<1.15" +solana-faucet = ">=1.10.29,<1.15" +solana-program = ">=1.10.29,<1.15" +solana-sdk = ">=1.10.29,<1.15" syn = { version = "1.0.60", features = ["full", "extra-traits"] } tar = "0.4.35" tokio = "1.0" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 550e4aba50..879da236fe 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -314,6 +314,9 @@ pub enum IdlCommand { #[clap(short, long)] filepath: String, }, + Close { + program_id: Pubkey, + }, /// Writes an IDL into a buffer account. This can be used with SetBuffer /// to perform an upgrade. WriteBuffer { @@ -1230,7 +1233,6 @@ fn _build_cwd( ) -> Result<()> { let exit = std::process::Command::new("cargo") .arg("build-sbf") - .args(["--arch", "bpf"]) .args(cargo_args) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) @@ -1500,7 +1502,9 @@ fn fetch_idl(cfg_override: &ConfigOverride, idl_addr: Pubkey) -> Result { let mut d: &[u8] = &account.data[8..]; let idl_account: IdlAccount = AnchorDeserialize::deserialize(&mut d)?; - let mut z = ZlibDecoder::new(&idl_account.data[..]); + let compressed_len: usize = idl_account.data_len.try_into().unwrap(); + let compressed_bytes = &account.data[44..44 + compressed_len]; + let mut z = ZlibDecoder::new(compressed_bytes); let mut s = Vec::new(); z.read_to_end(&mut s)?; serde_json::from_slice(&s[..]).map_err(Into::into) @@ -1531,6 +1535,7 @@ fn idl(cfg_override: &ConfigOverride, subcmd: IdlCommand) -> Result<()> { program_id, filepath, } => idl_init(cfg_override, program_id, filepath), + IdlCommand::Close { program_id } => idl_close(cfg_override, program_id), IdlCommand::WriteBuffer { program_id, filepath, @@ -1589,6 +1594,17 @@ fn idl_init(cfg_override: &ConfigOverride, program_id: Pubkey, idl_filepath: Str }) } +fn idl_close(cfg_override: &ConfigOverride, program_id: Pubkey) -> Result<()> { + with_workspace(cfg_override, |cfg| { + let idl_address = IdlAccount::address(&program_id); + idl_close_account(cfg, &program_id, idl_address)?; + + println!("Idl account closed: {:?}", idl_address); + + Ok(()) + }) +} + fn idl_write_buffer( cfg_override: &ConfigOverride, program_id: Pubkey, @@ -1762,6 +1778,44 @@ fn idl_erase_authority(cfg_override: &ConfigOverride, program_id: Pubkey) -> Res Ok(()) } +fn idl_close_account(cfg: &Config, program_id: &Pubkey, idl_address: Pubkey) -> Result<()> { + let keypair = solana_sdk::signature::read_keypair_file(&cfg.provider.wallet.to_string()) + .map_err(|_| anyhow!("Unable to read keypair file"))?; + let url = cluster_url(cfg, &cfg.test_validator); + let client = RpcClient::new(url); + + // Instruction accounts. + let accounts = vec![ + AccountMeta::new(idl_address, false), + AccountMeta::new_readonly(keypair.pubkey(), true), + AccountMeta::new(keypair.pubkey(), true), + ]; + // Instruction. + let ix = Instruction { + program_id: *program_id, + accounts, + data: { serialize_idl_ix(anchor_lang::idl::IdlInstruction::Close {})? }, + }; + // Send transaction. + let latest_hash = client.get_latest_blockhash()?; + let tx = Transaction::new_signed_with_payer( + &[ix], + Some(&keypair.pubkey()), + &[&keypair], + latest_hash, + ); + client.send_and_confirm_transaction_with_spinner_and_config( + &tx, + CommitmentConfig::confirmed(), + RpcSendTransactionConfig { + skip_preflight: true, + ..RpcSendTransactionConfig::default() + }, + )?; + + Ok(()) +} + // Write the idl to the account buffer, chopping up the IDL into pieces // and sending multiple transactions in the event the IDL doesn't fit into // a single transaction. @@ -2541,9 +2595,22 @@ fn create_idl_account( // Run `Create instruction. { - let data = serialize_idl_ix(anchor_lang::idl::IdlInstruction::Create { - data_len: (idl_data.len() as u64) * 2, // Double for future growth. - })?; + let pda_max_growth = 60_000; + let idl_header_size = 44; + let idl_data_len = idl_data.len() as u64; + // We're only going to support up to 6 instructions in one transaction + // because will anyone really have a >60kb IDL? + if idl_data_len > pda_max_growth { + return Err(anyhow!( + "Your IDL is over 60kb and this isn't supported right now" + )); + } + // Double for future growth. + let data_len = (idl_data_len * 2).min(pda_max_growth - idl_header_size); + + let num_additional_instructions = data_len / 10000; + let mut instructions = Vec::new(); + let data = serialize_idl_ix(anchor_lang::idl::IdlInstruction::Create { data_len })?; let program_signer = Pubkey::find_program_address(&[], program_id).0; let accounts = vec![ AccountMeta::new_readonly(keypair.pubkey(), true), @@ -2553,14 +2620,27 @@ fn create_idl_account( AccountMeta::new_readonly(*program_id, false), AccountMeta::new_readonly(solana_program::sysvar::rent::ID, false), ]; - let ix = Instruction { + instructions.push(Instruction { program_id: *program_id, accounts, data, - }; + }); + + for _ in 0..num_additional_instructions { + let data = serialize_idl_ix(anchor_lang::idl::IdlInstruction::Resize { data_len })?; + instructions.push(Instruction { + program_id: *program_id, + accounts: vec![ + AccountMeta::new(idl_address, false), + AccountMeta::new_readonly(keypair.pubkey(), true), + AccountMeta::new_readonly(solana_program::system_program::ID, false), + ], + data, + }); + } let latest_hash = client.get_latest_blockhash()?; let tx = Transaction::new_signed_with_payer( - &[ix], + &instructions, Some(&keypair.pubkey()), &[&keypair], latest_hash, diff --git a/client/Cargo.toml b/client/Cargo.toml index 1c6d44b019..47430b5fa0 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,12 +11,12 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } -solana-account-decoder = "1.10.29" -solana-client = "1.10.29" -solana-sdk = "1.10.29" +solana-account-decoder = ">=1.10.29,<1.15" +solana-client = ">=1.10.29,<1.15" +solana-sdk = ">=1.10.29,<1.15" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 14d96efe83..b1730da55c 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -16,4 +16,4 @@ shellexpand = "2.1.0" anyhow = "1.0.32" rand = "0.7.3" clap = { version = "3.0.0-rc.0", features = ["derive"] } -solana-sdk = "1.10.29" +solana-sdk = ">=1.10.29,<1.15" diff --git a/examples/tutorial/basic-0/Anchor.toml b/examples/tutorial/basic-0/Anchor.toml deleted file mode 100644 index 7e339cf99d..0000000000 --- a/examples/tutorial/basic-0/Anchor.toml +++ /dev/null @@ -1,9 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -basic_0 = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" diff --git a/examples/tutorial/basic-0/Cargo.toml b/examples/tutorial/basic-0/Cargo.toml deleted file mode 100644 index 3fc1846852..0000000000 --- a/examples/tutorial/basic-0/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -members = [ - "programs/*" -] diff --git a/examples/tutorial/basic-0/client.js b/examples/tutorial/basic-0/client.js deleted file mode 100644 index 77a7f08b1c..0000000000 --- a/examples/tutorial/basic-0/client.js +++ /dev/null @@ -1,29 +0,0 @@ -// client.js is used to introduce the reader to generating clients from IDLs. -// It is not expected users directly test with this example. For a more -// ergonomic example, see `tests/basic-0.js` in this workspace. - -const anchor = require("@project-serum/anchor"); - -// Configure the local cluster. -anchor.setProvider(anchor.AnchorProvider.local()); - -async function main() { - // #region main - // Read the generated IDL. - const idl = JSON.parse( - require("fs").readFileSync("./target/idl/basic_0.json", "utf8") - ); - - // Address of the deployed program. - const programId = new anchor.web3.PublicKey(""); - - // Generate the program client from IDL. - const program = new anchor.Program(idl, programId); - - // Execute the RPC. - await program.rpc.initialize(); - // #endregion main -} - -console.log("Running client."); -main().then(() => console.log("Success")); diff --git a/examples/tutorial/basic-0/package.json b/examples/tutorial/basic-0/package.json deleted file mode 100644 index b7f167118f..0000000000 --- a/examples/tutorial/basic-0/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "basic-0", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test --skip-lint" - } -} diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml deleted file mode 100644 index 28c26ed50d..0000000000 --- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "basic-0" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "basic_0" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } diff --git a/examples/tutorial/basic-0/programs/basic-0/Xargo.toml b/examples/tutorial/basic-0/programs/basic-0/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-0/programs/basic-0/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-0/programs/basic-0/src/lib.rs b/examples/tutorial/basic-0/programs/basic-0/src/lib.rs deleted file mode 100644 index 799fa9e143..0000000000 --- a/examples/tutorial/basic-0/programs/basic-0/src/lib.rs +++ /dev/null @@ -1,14 +0,0 @@ -use anchor_lang::prelude::*; - -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); - -#[program] -mod basic_0 { - use super::*; - pub fn initialize(_ctx: Context) -> Result<()> { - Ok(()) - } -} - -#[derive(Accounts)] -pub struct Initialize {} diff --git a/examples/tutorial/basic-0/tests/basic-0.js b/examples/tutorial/basic-0/tests/basic-0.js deleted file mode 100644 index e9be96096b..0000000000 --- a/examples/tutorial/basic-0/tests/basic-0.js +++ /dev/null @@ -1,16 +0,0 @@ -const anchor = require("@project-serum/anchor"); - -describe("basic-0", () => { - // Configure the client to use the local cluster. - anchor.setProvider(anchor.AnchorProvider.local()); - - it("Uses the workspace to invoke the initialize instruction", async () => { - // #region code - // Read the deployed program from the workspace. - const program = anchor.workspace.Basic0; - - // Execute the RPC. - await program.rpc.initialize(); - // #endregion code - }); -}); diff --git a/examples/tutorial/basic-1/Anchor.toml b/examples/tutorial/basic-1/Anchor.toml deleted file mode 100644 index c2a1399e0a..0000000000 --- a/examples/tutorial/basic-1/Anchor.toml +++ /dev/null @@ -1,9 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -basic_1 = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" diff --git a/examples/tutorial/basic-1/Cargo.toml b/examples/tutorial/basic-1/Cargo.toml deleted file mode 100644 index 3fc1846852..0000000000 --- a/examples/tutorial/basic-1/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -members = [ - "programs/*" -] diff --git a/examples/tutorial/basic-1/package.json b/examples/tutorial/basic-1/package.json deleted file mode 100644 index 5514e42eaf..0000000000 --- a/examples/tutorial/basic-1/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "basic-1", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test --skip-lint" - } -} diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml deleted file mode 100644 index f0471eaa24..0000000000 --- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "basic-1" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "basic_1" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } diff --git a/examples/tutorial/basic-1/programs/basic-1/Xargo.toml b/examples/tutorial/basic-1/programs/basic-1/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-1/programs/basic-1/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-1/programs/basic-1/src/lib.rs b/examples/tutorial/basic-1/programs/basic-1/src/lib.rs deleted file mode 100644 index b2d346ea97..0000000000 --- a/examples/tutorial/basic-1/programs/basic-1/src/lib.rs +++ /dev/null @@ -1,40 +0,0 @@ -use anchor_lang::prelude::*; - -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); - -#[program] -mod basic_1 { - use super::*; - - pub fn initialize(ctx: Context, data: u64) -> Result<()> { - let my_account = &mut ctx.accounts.my_account; - my_account.data = data; - Ok(()) - } - - pub fn update(ctx: Context, data: u64) -> Result<()> { - let my_account = &mut ctx.accounts.my_account; - my_account.data = data; - Ok(()) - } -} - -#[derive(Accounts)] -pub struct Initialize<'info> { - #[account(init, payer = user, space = 8 + 8)] - pub my_account: Account<'info, MyAccount>, - #[account(mut)] - pub user: Signer<'info>, - pub system_program: Program<'info, System>, -} - -#[derive(Accounts)] -pub struct Update<'info> { - #[account(mut)] - pub my_account: Account<'info, MyAccount>, -} - -#[account] -pub struct MyAccount { - pub data: u64, -} diff --git a/examples/tutorial/basic-1/tests/basic-1.js b/examples/tutorial/basic-1/tests/basic-1.js deleted file mode 100644 index 98e7ef5a8c..0000000000 --- a/examples/tutorial/basic-1/tests/basic-1.js +++ /dev/null @@ -1,65 +0,0 @@ -const assert = require("assert"); -const anchor = require("@project-serum/anchor"); -const { SystemProgram } = anchor.web3; - -describe("basic-1", () => { - // Use a local provider. - const provider = anchor.AnchorProvider.local(); - - // Configure the client to use the local cluster. - anchor.setProvider(provider); - - it("Creates and initializes an account in a single atomic transaction (simplified)", async () => { - // #region code-simplified - // The program to execute. - const program = anchor.workspace.Basic1; - - // The Account to create. - const myAccount = anchor.web3.Keypair.generate(); - - // Create the new account and initialize it with the program. - // #region code-simplified - await program.rpc.initialize(new anchor.BN(1234), { - accounts: { - myAccount: myAccount.publicKey, - user: provider.wallet.publicKey, - systemProgram: SystemProgram.programId, - }, - signers: [myAccount], - }); - // #endregion code-simplified - - // Fetch the newly created account from the cluster. - const account = await program.account.myAccount.fetch(myAccount.publicKey); - - // Check it's state was initialized. - assert.ok(account.data.eq(new anchor.BN(1234))); - - // Store the account for the next test. - _myAccount = myAccount; - }); - - it("Updates a previously created account", async () => { - const myAccount = _myAccount; - - // #region update-test - - // The program to execute. - const program = anchor.workspace.Basic1; - - // Invoke the update rpc. - await program.rpc.update(new anchor.BN(4321), { - accounts: { - myAccount: myAccount.publicKey, - }, - }); - - // Fetch the newly updated account. - const account = await program.account.myAccount.fetch(myAccount.publicKey); - - // Check it's state was mutated. - assert.ok(account.data.eq(new anchor.BN(4321))); - - // #endregion update-test - }); -}); diff --git a/examples/tutorial/basic-2/Anchor.toml b/examples/tutorial/basic-2/Anchor.toml deleted file mode 100644 index 2530e958a3..0000000000 --- a/examples/tutorial/basic-2/Anchor.toml +++ /dev/null @@ -1,9 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -basic_2 = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" diff --git a/examples/tutorial/basic-2/Cargo.toml b/examples/tutorial/basic-2/Cargo.toml deleted file mode 100644 index 3fc1846852..0000000000 --- a/examples/tutorial/basic-2/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -members = [ - "programs/*" -] diff --git a/examples/tutorial/basic-2/package.json b/examples/tutorial/basic-2/package.json deleted file mode 100644 index dde7e797c0..0000000000 --- a/examples/tutorial/basic-2/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "basic-2", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test --skip-lint" - } -} diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml deleted file mode 100644 index eede5b3d52..0000000000 --- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "basic-2" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "basic_2" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } diff --git a/examples/tutorial/basic-2/programs/basic-2/Xargo.toml b/examples/tutorial/basic-2/programs/basic-2/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-2/programs/basic-2/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-2/programs/basic-2/src/lib.rs b/examples/tutorial/basic-2/programs/basic-2/src/lib.rs deleted file mode 100644 index 6b9c66b34f..0000000000 --- a/examples/tutorial/basic-2/programs/basic-2/src/lib.rs +++ /dev/null @@ -1,43 +0,0 @@ -use anchor_lang::prelude::*; - -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); - -#[program] -mod basic_2 { - use super::*; - - pub fn create(ctx: Context, authority: Pubkey) -> Result<()> { - let counter = &mut ctx.accounts.counter; - counter.authority = authority; - counter.count = 0; - Ok(()) - } - - pub fn increment(ctx: Context) -> Result<()> { - let counter = &mut ctx.accounts.counter; - counter.count += 1; - Ok(()) - } -} - -#[derive(Accounts)] -pub struct Create<'info> { - #[account(init, payer = user, space = 8 + 40)] - pub counter: Account<'info, Counter>, - #[account(mut)] - pub user: Signer<'info>, - pub system_program: Program<'info, System>, -} - -#[derive(Accounts)] -pub struct Increment<'info> { - #[account(mut, has_one = authority)] - pub counter: Account<'info, Counter>, - pub authority: Signer<'info>, -} - -#[account] -pub struct Counter { - pub authority: Pubkey, - pub count: u64, -} diff --git a/examples/tutorial/basic-2/tests/basic-2.js b/examples/tutorial/basic-2/tests/basic-2.js deleted file mode 100644 index 8f638ee8cf..0000000000 --- a/examples/tutorial/basic-2/tests/basic-2.js +++ /dev/null @@ -1,48 +0,0 @@ -const assert = require("assert"); -const anchor = require("@project-serum/anchor"); -const { SystemProgram } = anchor.web3; - -describe("basic-2", () => { - const provider = anchor.AnchorProvider.local(); - - // Configure the client to use the local cluster. - anchor.setProvider(provider); - - // Counter for the tests. - const counter = anchor.web3.Keypair.generate(); - - // Program for the tests. - const program = anchor.workspace.Basic2; - - it("Creates a counter", async () => { - await program.rpc.create(provider.wallet.publicKey, { - accounts: { - counter: counter.publicKey, - user: provider.wallet.publicKey, - systemProgram: SystemProgram.programId, - }, - signers: [counter], - }); - - let counterAccount = await program.account.counter.fetch(counter.publicKey); - - assert.ok(counterAccount.authority.equals(provider.wallet.publicKey)); - assert.ok(counterAccount.count.toNumber() === 0); - }); - - it("Updates a counter", async () => { - await program.rpc.increment({ - accounts: { - counter: counter.publicKey, - authority: provider.wallet.publicKey, - }, - }); - - const counterAccount = await program.account.counter.fetch( - counter.publicKey - ); - - assert.ok(counterAccount.authority.equals(provider.wallet.publicKey)); - assert.ok(counterAccount.count.toNumber() == 1); - }); -}); diff --git a/examples/tutorial/basic-3/Anchor.toml b/examples/tutorial/basic-3/Anchor.toml deleted file mode 100644 index d337715672..0000000000 --- a/examples/tutorial/basic-3/Anchor.toml +++ /dev/null @@ -1,10 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -puppet = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" -puppet_master = "HmbTLCmaGvZhKnn1Zfa1JVnp7vkMV4DYVxPLWBVoN65L" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" diff --git a/examples/tutorial/basic-3/Cargo.toml b/examples/tutorial/basic-3/Cargo.toml deleted file mode 100644 index a60de986d3..0000000000 --- a/examples/tutorial/basic-3/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -members = [ - "programs/*" -] diff --git a/examples/tutorial/basic-3/package.json b/examples/tutorial/basic-3/package.json deleted file mode 100644 index 289843b088..0000000000 --- a/examples/tutorial/basic-3/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "basic-3", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test --skip-lint" - } -} diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml deleted file mode 100644 index 505d199c51..0000000000 --- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "puppet-master" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "puppet_master" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } -puppet = { path = "../puppet", features = ["cpi"] } diff --git a/examples/tutorial/basic-3/programs/puppet-master/Xargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-3/programs/puppet-master/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-3/programs/puppet-master/src/lib.rs b/examples/tutorial/basic-3/programs/puppet-master/src/lib.rs deleted file mode 100644 index 29d32bac7b..0000000000 --- a/examples/tutorial/basic-3/programs/puppet-master/src/lib.rs +++ /dev/null @@ -1,28 +0,0 @@ -// #region core -use anchor_lang::prelude::*; -use puppet::cpi::accounts::SetData; -use puppet::program::Puppet; -use puppet::{self, Data}; - -declare_id!("HmbTLCmaGvZhKnn1Zfa1JVnp7vkMV4DYVxPLWBVoN65L"); - -#[program] -mod puppet_master { - use super::*; - pub fn pull_strings(ctx: Context, data: u64) -> anchor_lang::Result<()> { - let cpi_program = ctx.accounts.puppet_program.to_account_info(); - let cpi_accounts = SetData { - puppet: ctx.accounts.puppet.to_account_info(), - }; - let cpi_ctx = CpiContext::new(cpi_program, cpi_accounts); - puppet::cpi::set_data(cpi_ctx, data) - } -} - -#[derive(Accounts)] -pub struct PullStrings<'info> { - #[account(mut)] - pub puppet: Account<'info, Data>, - pub puppet_program: Program<'info, Puppet>, -} -// #endregion core diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml deleted file mode 100644 index 72f2418edd..0000000000 --- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "puppet" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "puppet" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } diff --git a/examples/tutorial/basic-3/programs/puppet/Xargo.toml b/examples/tutorial/basic-3/programs/puppet/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-3/programs/puppet/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-3/programs/puppet/src/lib.rs b/examples/tutorial/basic-3/programs/puppet/src/lib.rs deleted file mode 100644 index 11646bf379..0000000000 --- a/examples/tutorial/basic-3/programs/puppet/src/lib.rs +++ /dev/null @@ -1,37 +0,0 @@ -use anchor_lang::prelude::*; - -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); - -#[program] -pub mod puppet { - use super::*; - pub fn initialize(_ctx: Context) -> Result<()> { - Ok(()) - } - - pub fn set_data(ctx: Context, data: u64) -> Result<()> { - let puppet = &mut ctx.accounts.puppet; - puppet.data = data; - Ok(()) - } -} - -#[derive(Accounts)] -pub struct Initialize<'info> { - #[account(init, payer = user, space = 8 + 8)] - pub puppet: Account<'info, Data>, - #[account(mut)] - pub user: Signer<'info>, - pub system_program: Program<'info, System>, -} - -#[derive(Accounts)] -pub struct SetData<'info> { - #[account(mut)] - pub puppet: Account<'info, Data>, -} - -#[account] -pub struct Data { - pub data: u64, -} diff --git a/examples/tutorial/basic-3/tests/basic-3.js b/examples/tutorial/basic-3/tests/basic-3.js deleted file mode 100644 index ad5a75d30a..0000000000 --- a/examples/tutorial/basic-3/tests/basic-3.js +++ /dev/null @@ -1,38 +0,0 @@ -const assert = require("assert"); -const anchor = require("@project-serum/anchor"); -const { SystemProgram } = anchor.web3; - -describe("basic-3", () => { - const provider = anchor.AnchorProvider.local(); - - // Configure the client to use the local cluster. - anchor.setProvider(provider); - - it("Performs CPI from puppet master to puppet", async () => { - const puppetMaster = anchor.workspace.PuppetMaster; - const puppet = anchor.workspace.Puppet; - - // Initialize a new puppet account. - const newPuppetAccount = anchor.web3.Keypair.generate(); - const tx = await puppet.rpc.initialize({ - accounts: { - puppet: newPuppetAccount.publicKey, - user: provider.wallet.publicKey, - systemProgram: SystemProgram.programId, - }, - signers: [newPuppetAccount], - }); - - // Invoke the puppet master to perform a CPI to the puppet. - await puppetMaster.rpc.pullStrings(new anchor.BN(111), { - accounts: { - puppet: newPuppetAccount.publicKey, - puppetProgram: puppet.programId, - }, - }); - - // Check the state updated. - puppetAccount = await puppet.account.data.fetch(newPuppetAccount.publicKey); - assert.ok(puppetAccount.data.eq(new anchor.BN(111))); - }); -}); diff --git a/examples/tutorial/basic-4/Anchor.toml b/examples/tutorial/basic-4/Anchor.toml deleted file mode 100644 index f60d23bbf2..0000000000 --- a/examples/tutorial/basic-4/Anchor.toml +++ /dev/null @@ -1,9 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -basic_4 = "CwrqeMj2U8tFr1Rhkgwc84tpAsqbt9pTt2a4taoTADPr" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" diff --git a/examples/tutorial/basic-4/Cargo.toml b/examples/tutorial/basic-4/Cargo.toml deleted file mode 100644 index a60de986d3..0000000000 --- a/examples/tutorial/basic-4/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[workspace] -members = [ - "programs/*" -] diff --git a/examples/tutorial/basic-4/package.json b/examples/tutorial/basic-4/package.json deleted file mode 100644 index 0044bb3fcf..0000000000 --- a/examples/tutorial/basic-4/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "basic-4", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test --skip-lint" - } -} diff --git a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml deleted file mode 100644 index 7c80e3ad7a..0000000000 --- a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "basic-4" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" - -[lib] -crate-type = ["cdylib", "lib"] -name = "basic_4" - -[features] -no-entrypoint = [] -cpi = ["no-entrypoint"] - -[dependencies] -anchor-lang = { path = "../../../../../lang" } diff --git a/examples/tutorial/basic-4/programs/basic-4/Xargo.toml b/examples/tutorial/basic-4/programs/basic-4/Xargo.toml deleted file mode 100644 index 1744f098ae..0000000000 --- a/examples/tutorial/basic-4/programs/basic-4/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] \ No newline at end of file diff --git a/examples/tutorial/basic-4/programs/basic-4/src/lib.rs b/examples/tutorial/basic-4/programs/basic-4/src/lib.rs deleted file mode 100644 index 79d5d97eca..0000000000 --- a/examples/tutorial/basic-4/programs/basic-4/src/lib.rs +++ /dev/null @@ -1,44 +0,0 @@ -// #region code -use anchor_lang::prelude::*; - -declare_id!("CwrqeMj2U8tFr1Rhkgwc84tpAsqbt9pTt2a4taoTADPr"); - -#[program] -pub mod basic_4 { - use super::*; - - #[state] - pub struct Counter { - pub authority: Pubkey, - pub count: u64, - } - - impl Counter { - pub fn new(ctx: Context) -> anchor_lang::Result { - Ok(Self { - authority: *ctx.accounts.authority.key, - count: 0, - }) - } - - pub fn increment(&mut self, ctx: Context) -> anchor_lang::Result<()> { - if &self.authority != ctx.accounts.authority.key { - return Err(error!(ErrorCode::Unauthorized)); - } - self.count += 1; - Ok(()) - } - } -} - -#[derive(Accounts)] -pub struct Auth<'info> { - authority: Signer<'info>, -} -// #endregion code - -#[error_code] -pub enum ErrorCode { - #[msg("You are not authorized to perform this action.")] - Unauthorized, -} diff --git a/examples/tutorial/basic-4/tests/basic-4.js b/examples/tutorial/basic-4/tests/basic-4.js deleted file mode 100644 index fddc7514ce..0000000000 --- a/examples/tutorial/basic-4/tests/basic-4.js +++ /dev/null @@ -1,41 +0,0 @@ -const assert = require("assert"); -const anchor = require("@project-serum/anchor"); - -describe("basic-4", () => { - const provider = anchor.AnchorProvider.local(); - - // Configure the client to use the local cluster. - anchor.setProvider(provider); - - const program = anchor.workspace.Basic4; - - it("Is runs the constructor", async () => { - // #region ctor - // Initialize the program's state struct. - await program.state.rpc.new({ - accounts: { - authority: provider.wallet.publicKey, - }, - }); - // #endregion ctor - - // Fetch the state struct from the network. - // #region accessor - const state = await program.state.fetch(); - // #endregion accessor - - assert.ok(state.count.eq(new anchor.BN(0))); - }); - - it("Executes a method on the program", async () => { - // #region instruction - await program.state.rpc.increment({ - accounts: { - authority: provider.wallet.publicKey, - }, - }); - // #endregion instruction - const state = await program.state.fetch(); - assert.ok(state.count.eq(new anchor.BN(1))); - }); -}); diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json deleted file mode 100644 index 6760dfaf5e..0000000000 --- a/examples/tutorial/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "anchor-examples", - "private": true, - "scripts": { - "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w", - "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check" - }, - "workspaces": [ - "basic-0", - "basic-1", - "basic-2", - "basic-3", - "basic-4" - ], - "dependencies": { - "@project-serum/anchor": "file:../../ts" - }, - "devDependencies": { - "mocha": "^9.1.3", - "prettier": "^2.5.1" - } -} diff --git a/examples/tutorial/yarn.lock b/examples/tutorial/yarn.lock deleted file mode 100644 index 61b4f39f65..0000000000 --- a/examples/tutorial/yarn.lock +++ /dev/null @@ -1,1077 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" - integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== - dependencies: - regenerator-runtime "^0.13.4" - -"@ethersproject/bytes@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c" - integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog== - dependencies: - "@ethersproject/logger" "^5.5.0" - -"@ethersproject/logger@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d" - integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg== - -"@ethersproject/sha2@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.5.0.tgz#a40a054c61f98fd9eee99af2c3cc6ff57ec24db7" - integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA== - dependencies: - "@ethersproject/bytes" "^5.5.0" - "@ethersproject/logger" "^5.5.0" - hash.js "1.1.7" - -"@project-serum/anchor@file:../../ts": - version "0.25.0" - dependencies: - "@project-serum/borsh" "^0.2.5" - "@solana/web3.js" "^1.36.0" - base64-js "^1.5.1" - bn.js "^5.1.2" - bs58 "^4.0.1" - buffer-layout "^1.2.2" - camelcase "^5.3.1" - cross-fetch "^3.1.5" - crypto-hash "^1.3.0" - eventemitter3 "^4.0.7" - js-sha256 "^0.9.0" - pako "^2.0.3" - snake-case "^3.0.4" - superstruct "^0.15.4" - toml "^3.0.0" - -"@project-serum/borsh@^0.2.5": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@project-serum/borsh/-/borsh-0.2.5.tgz#6059287aa624ecebbfc0edd35e4c28ff987d8663" - integrity sha512-UmeUkUoKdQ7rhx6Leve1SssMR/Ghv8qrEiyywyxSWg7ooV7StdpPBhciiy5eB3T0qU1BXvdRNC8TdrkxK7WC5Q== - dependencies: - bn.js "^5.1.2" - buffer-layout "^1.2.0" - -"@solana/buffer-layout@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-3.0.0.tgz#b9353caeb9a1589cb77a1b145bcb1a9a93114326" - integrity sha512-MVdgAKKL39tEs0l8je0hKaXLQFb7Rdfb0Xg2LjFZd8Lfdazkg6xiS98uAZrEKvaoF3i4M95ei9RydkGIDMeo3w== - dependencies: - buffer "~6.0.3" - -"@solana/web3.js@^1.36.0": - version "1.36.0" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.36.0.tgz#79d7d5217b49b80139f4de68953adc5b9a9a264f" - integrity sha512-RNT1451iRR7TyW7EJKMCrH/0OXawIe4zVm0DWQASwXlR/u1jmW6FrmH0lujIh7cGTlfOVbH+2ZU9AVUPLBFzwA== - dependencies: - "@babel/runtime" "^7.12.5" - "@ethersproject/sha2" "^5.5.0" - "@solana/buffer-layout" "^3.0.0" - bn.js "^5.0.0" - borsh "^0.4.0" - bs58 "^4.0.1" - buffer "6.0.1" - cross-fetch "^3.1.4" - jayson "^3.4.4" - js-sha3 "^0.8.0" - rpc-websockets "^7.4.2" - secp256k1 "^4.0.2" - superstruct "^0.14.2" - tweetnacl "^1.0.0" - -"@types/bn.js@^4.11.5": - version "4.11.6" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" - integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== - dependencies: - "@types/node" "*" - -"@types/connect@^3.4.33": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/express-serve-static-core@^4.17.9": - version "4.17.25" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz#e42f7046adc65ece2eb6059b77aecfbe9e9f82e0" - integrity sha512-OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/lodash@^4.14.159": - version "4.14.176" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0" - integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ== - -"@types/node@*": - version "16.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" - integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== - -"@types/node@^12.12.54": - version "12.20.37" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.37.tgz#abb38afa9d6e8a2f627a8cb52290b3c80fbe61ed" - integrity sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/ws@^7.4.4": - version "7.4.7" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702" - integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww== - dependencies: - "@types/node" "*" - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base-x@^3.0.2: - version "3.0.9" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.9.tgz#6349aaabb58526332de9f60995e548a53fe21320" - integrity sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ== - dependencies: - safe-buffer "^5.0.1" - -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== - -bn.js@^5.0.0, bn.js@^5.1.2: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== - -borsh@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/borsh/-/borsh-0.4.0.tgz#9dd6defe741627f1315eac2a73df61421f6ddb9f" - integrity sha512-aX6qtLya3K0AkT66CmYWCCDr77qsE9arV05OmdFpmat9qu8Pg9J5tBUPDztAW5fNh/d/MyVG/OYziP52Ndzx1g== - dependencies: - "@types/bn.js" "^4.11.5" - bn.js "^5.0.0" - bs58 "^4.0.0" - text-encoding-utf-8 "^1.0.2" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -brorand@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -bs58@^4.0.0, bs58@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" - integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo= - dependencies: - base-x "^3.0.2" - -buffer-layout@^1.2.0, buffer-layout@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/buffer-layout/-/buffer-layout-1.2.2.tgz#b9814e7c7235783085f9ca4966a0cfff112259d5" - integrity sha512-kWSuLN694+KTk8SrYvCqwP2WcgQjoRCiF5b4QDvkkz8EmgD+aWAIceGFKMIAdmF/pH+vpgNV3d3kAKorcdAmWA== - -buffer@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.1.tgz#3cbea8c1463e5a0779e30b66d4c88c6ffa182ac2" - integrity sha512-rVAXBwEcEoYtxnHSO5iWyhzV/O1WMtkUYWlfdLS7FjU4PnSJJHEfHXi/uHPI5EwltmOA794gN3bm3/pzuctWjQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - -buffer@~6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" - integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.2.1" - -bufferutil@^4.0.1: - version "4.0.5" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028" - integrity sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A== - dependencies: - node-gyp-build "^4.3.0" - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -circular-json@^0.5.9: - version "0.5.9" - resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d" - integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ== - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -commander@^2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -cross-fetch@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" - integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== - dependencies: - node-fetch "2.6.1" - -cross-fetch@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== - dependencies: - node-fetch "2.6.7" - -crypto-hash@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/crypto-hash/-/crypto-hash-1.3.0.tgz#b402cb08f4529e9f4f09346c3e275942f845e247" - integrity sha512-lyAZ0EMyjDkVvz8WOeVnuCPvKVBXcMv1l5SVqO1yC7PzTwrD/pPje/BIRbWhMoPe436U+Y2nD7f5bFx0kt+Sbg== - -debug@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -delay@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d" - integrity sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw== - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -elliptic@^6.5.2: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - -es6-promisify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" - integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= - dependencies: - es6-promise "^4.0.3" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eventemitter3@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -eyes@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" - integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob@7.1.7: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -growl@1.10.5: - version "1.10.5" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" - integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" - integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.1" - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hmac-drbg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -ieee754@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isomorphic-ws@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" - integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== - -jayson@^3.4.4: - version "3.6.5" - resolved "https://registry.yarnpkg.com/jayson/-/jayson-3.6.5.tgz#e560bcad4daf098c7391f46ba8efc9d6f34a4102" - integrity sha512-wmOjX+eQcnCDyPF4KORomaIj9wj3h0B5VEbeD0+2VHfTfErB+h1zpR7oBkgCZp36AFjp3+a4CLz6U72BYpFHAw== - dependencies: - "@types/connect" "^3.4.33" - "@types/express-serve-static-core" "^4.17.9" - "@types/lodash" "^4.14.159" - "@types/node" "^12.12.54" - "@types/ws" "^7.4.4" - JSONStream "^1.3.5" - commander "^2.20.3" - delay "^5.0.0" - es6-promisify "^5.0.0" - eyes "^0.1.8" - isomorphic-ws "^4.0.1" - json-stringify-safe "^5.0.1" - lodash "^4.17.20" - uuid "^3.4.0" - ws "^7.4.5" - -js-sha256@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" - integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA== - -js-sha3@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" - integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== - -js-yaml@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash@^4.17.20: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - -minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= - -minimatch@3.0.4, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -mocha@^9.1.3: - version "9.1.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.3.tgz#8a623be6b323810493d8c8f6f7667440fa469fdb" - integrity sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.2" - debug "4.3.2" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.7" - growl "1.10.5" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.25" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - workerpool "6.1.5" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nanoid@3.1.25: - version "3.1.25" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" - integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -node-addon-api@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" - integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== - -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - -node-gyp-build@^4.2.0, node-gyp-build@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" - integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -pako@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d" - integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -prettier@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" - integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -rpc-websockets@^7.4.2: - version "7.4.16" - resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.4.16.tgz#eb701cdef577d4357ba5f526d50e25f370396fac" - integrity sha512-0b7OVhutzwRIaYAtJo5tqtaQTWKfwAsKnaThOSOy+VkhVdleNUgb8eZnWSdWITRZZEigV5uPEIDr5KZe4DBrdQ== - dependencies: - "@babel/runtime" "^7.11.2" - circular-json "^0.5.9" - eventemitter3 "^4.0.7" - uuid "^8.3.0" - ws "^7.4.5" - optionalDependencies: - bufferutil "^4.0.1" - utf-8-validate "^5.0.2" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -secp256k1@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.2.tgz#15dd57d0f0b9fdb54ac1fa1694f40e5e9a54f4a1" - integrity sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg== - dependencies: - elliptic "^6.5.2" - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -snake-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" - integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-json-comments@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -superstruct@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b" - integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ== - -superstruct@^0.15.4: - version "0.15.5" - resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.5.tgz#0f0a8d3ce31313f0d84c6096cd4fa1bfdedc9dab" - integrity sha512-4AOeU+P5UuE/4nOUkmcQdW5y7i9ndt1cQd/3iUe+LTz3RxESf/W/5lg4B74HbDMMv8PHnPnGCQFH45kBcrQYoQ== - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -text-encoding-utf-8@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" - integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg== - -"through@>=2.2.7 <3": - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toml@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" - integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= - -tslib@^2.0.3: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tweetnacl@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" - integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== - -utf-8-validate@^5.0.2: - version "5.0.7" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922" - integrity sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q== - dependencies: - node-gyp-build "^4.3.0" - -uuid@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -uuid@^8.3.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -which@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -workerpool@6.1.5: - version "6.1.5" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581" - integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@^7.4.5: - version "7.5.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" - integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/examples/yarn.lock b/examples/yarn.lock deleted file mode 100644 index fb57ccd13a..0000000000 --- a/examples/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - diff --git a/lang/Cargo.toml b/lang/Cargo.toml index dc310ca483..79e5babbb8 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,19 +26,19 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.16", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.16", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.16", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.19", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.19", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" -borsh = ">=0.9,<0.11" +borsh = "0.9.3" bytemuck = "1.4.0" -solana-program = "1.10.29" +solana-program = ">=1.10.29,<1.15" thiserror = "1.0.20" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 6f4778ac9a..11402ee5ce 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index d508ff8256..0f035b3d91 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index c9056133bd..7f024de574 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index e5ca5ee734..a5ed7b92c2 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 6c47773582..33ec0e2084 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 3feec28f7d..733341fd6a 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 13538b7029..12f980e887 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 7b983e53e9..d4b9c8597a 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 2385f46ac1..d00334754a 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.16", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/src/error.rs b/lang/src/error.rs index 30d5a2d2f6..e8f3382dd1 100644 --- a/lang/src/error.rs +++ b/lang/src/error.rs @@ -41,6 +41,9 @@ pub enum ErrorCode { /// 1001 - Invalid program given to the IDL instruction #[msg("Invalid program given to the IDL instruction")] IdlInstructionInvalidProgram, + /// 1002 - IDL Account must be empty in order to resize + #[msg("IDL account must be empty in order to resize, try closing first")] + IdlAccountNotEmpty, // Constraints /// 2000 - A mut constraint was violated diff --git a/lang/src/idl.rs b/lang/src/idl.rs index 8bbd89316a..bcb3d521a4 100644 --- a/lang/src/idl.rs +++ b/lang/src/idl.rs @@ -45,6 +45,9 @@ pub enum IdlInstruction { SetBuffer, // Sets a new authority on the IdlAccount. SetAuthority { new_authority: Pubkey }, + Close, + // Increases account size for accounts that need over 10kb. + Resize { data_len: u64 }, } // Accounts for the Create instruction. @@ -60,6 +63,17 @@ pub struct IdlAccounts<'info> { pub authority: Signer<'info>, } +// Accounts for resize account instruction +#[derive(Accounts)] +pub struct IdlResizeAccount<'info> { + #[account(mut, has_one = authority)] + #[allow(deprecated)] + pub idl: ProgramAccount<'info, IdlAccount>, + #[account(mut, constraint = authority.key != &ERASED_AUTHORITY)] + pub authority: Signer<'info>, + pub system_program: Program<'info, System>, +} + // Accounts for creating an idl buffer. #[derive(Accounts)] pub struct IdlCreateBuffer<'info> { @@ -85,6 +99,18 @@ pub struct IdlSetBuffer<'info> { pub authority: Signer<'info>, } +// Accounts for closing the canonical Idl buffer. +#[derive(Accounts)] +pub struct IdlCloseAccount<'info> { + #[account(mut, has_one = authority, close = sol_destination)] + #[allow(deprecated)] + pub account: ProgramAccount<'info, IdlAccount>, + #[account(constraint = authority.key != &ERASED_AUTHORITY)] + pub authority: Signer<'info>, + #[account(mut)] + pub sol_destination: AccountInfo<'info>, +} + // The account holding a program's IDL. This is stored on chain so that clients // can fetch it and generate a client with nothing but a program's ID. // @@ -95,8 +121,9 @@ pub struct IdlSetBuffer<'info> { pub struct IdlAccount { // Address that can modify the IDL. pub authority: Pubkey, - // Compressed idl bytes. - pub data: Vec, + // Length of compressed idl bytes. + pub data_len: u32, + // Followed by compressed idl bytes. } impl IdlAccount { @@ -109,3 +136,22 @@ impl IdlAccount { "anchor:idl" } } + +use std::cell::{Ref, RefMut}; + +pub trait IdlTrailingData<'info> { + fn trailing_data(self) -> Ref<'info, [u8]>; + fn trailing_data_mut(self) -> RefMut<'info, [u8]>; +} + +#[allow(deprecated)] +impl<'a, 'info: 'a> IdlTrailingData<'a> for &'a ProgramAccount<'info, IdlAccount> { + fn trailing_data(self) -> Ref<'a, [u8]> { + let info = self.as_ref(); + Ref::map(info.try_borrow_data().unwrap(), |d| &d[44..]) + } + fn trailing_data_mut(self) -> RefMut<'a, [u8]> { + let info = self.as_ref(); + RefMut::map(info.try_borrow_mut_data().unwrap(), |d| &mut d[44..]) + } +} diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index c41a55ae5c..11a9361af5 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/lang/syn/src/codegen/program/handlers.rs b/lang/syn/src/codegen/program/handlers.rs index f965bd3f62..5dd62b0587 100644 --- a/lang/syn/src/codegen/program/handlers.rs +++ b/lang/syn/src/codegen/program/handlers.rs @@ -32,6 +32,22 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { __idl_create_account(program_id, &mut accounts, data_len)?; accounts.exit(program_id)?; }, + anchor_lang::idl::IdlInstruction::Resize { data_len } => { + let mut bumps = std::collections::BTreeMap::new(); + let mut reallocs = std::collections::BTreeSet::new(); + let mut accounts = + anchor_lang::idl::IdlResizeAccount::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?; + __idl_resize_account(program_id, &mut accounts, data_len)?; + accounts.exit(program_id)?; + }, + anchor_lang::idl::IdlInstruction::Close => { + let mut bumps = std::collections::BTreeMap::new(); + let mut reallocs = std::collections::BTreeSet::new(); + let mut accounts = + anchor_lang::idl::IdlCloseAccount::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?; + __idl_close_account(program_id, &mut accounts)?; + accounts.exit(program_id)?; + }, anchor_lang::idl::IdlInstruction::CreateBuffer => { let mut bumps = std::collections::BTreeMap::new(); let mut reallocs = std::collections::BTreeSet::new(); @@ -95,7 +111,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { let owner = accounts.program.key; let to = Pubkey::create_with_seed(&base, seed, owner).unwrap(); // Space: account discriminator || authority pubkey || vec len || vec data - let space = 8 + 32 + 4 + data_len as usize; + let space = std::cmp::min(8 + 32 + 4 + data_len as usize, 10_000); let rent = Rent::get()?; let lamports = rent.minimum_balance(space); let seeds = &[&[nonce][..]]; @@ -140,6 +156,64 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { Ok(()) } + #[inline(never)] + pub fn __idl_resize_account( + program_id: &Pubkey, + accounts: &mut anchor_lang::idl::IdlResizeAccount, + data_len: u64, + ) -> anchor_lang::Result<()> { + #[cfg(not(feature = "no-log-ix-name"))] + anchor_lang::prelude::msg!("Instruction: IdlResizeAccount"); + + let data_len: usize = data_len as usize; + + // We're not going to support increasing the size of accounts that already contain data + // because that would be messy and possibly dangerous + if accounts.idl.data_len != 0 { + return Err(anchor_lang::error::ErrorCode::IdlAccountNotEmpty.into()); + } + + let new_account_space = accounts.idl.to_account_info().data_len().checked_add(std::cmp::min( + data_len + .checked_sub(accounts.idl.to_account_info().data_len()) + .expect("data_len should always be >= the current account space"), + 10_000, + )) + .unwrap(); + + if new_account_space > accounts.idl.to_account_info().data_len() { + let sysvar_rent = Rent::get()?; + let new_rent_minimum = sysvar_rent.minimum_balance(new_account_space); + anchor_lang::system_program::transfer( + anchor_lang::context::CpiContext::new( + accounts.system_program.to_account_info(), + anchor_lang::system_program::Transfer { + from: accounts.authority.to_account_info(), + to: accounts.idl.to_account_info().clone(), + }, + ), + new_rent_minimum + .checked_sub(accounts.idl.to_account_info().lamports()) + .unwrap(), + )?; + accounts.idl.to_account_info().realloc(new_account_space, false)?; + } + + Ok(()) + + } + + #[inline(never)] + pub fn __idl_close_account( + program_id: &Pubkey, + accounts: &mut anchor_lang::idl::IdlCloseAccount, + ) -> anchor_lang::Result<()> { + #[cfg(not(feature = "no-log-ix-name"))] + anchor_lang::prelude::msg!("Instruction: IdlCloseAccount"); + + Ok(()) + } + #[inline(never)] pub fn __idl_create_buffer( program_id: &Pubkey, @@ -162,8 +236,16 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!("Instruction: IdlWrite"); - let mut idl = &mut accounts.idl; - idl.data.extend(idl_data); + let prev_len: usize = ::std::convert::TryInto::::try_into(accounts.idl.data_len).unwrap(); + let new_len: usize = prev_len + idl_data.len(); + accounts.idl.data_len = accounts.idl.data_len.checked_add(::std::convert::TryInto::::try_into(idl_data.len()).unwrap()).unwrap(); + + use anchor_lang::idl::IdlTrailingData; + let mut idl_bytes = accounts.idl.trailing_data_mut(); + let idl_expansion = &mut idl_bytes[prev_len..new_len]; + require_eq!(idl_expansion.len(), idl_data.len()); + idl_expansion.copy_from_slice(&idl_data[..]); + Ok(()) } @@ -188,7 +270,16 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!("Instruction: IdlSetBuffer"); - accounts.idl.data = accounts.buffer.data.clone(); + accounts.idl.data_len = accounts.buffer.data_len; + + use anchor_lang::idl::IdlTrailingData; + let buffer_len = ::std::convert::TryInto::::try_into(accounts.buffer.data_len).unwrap(); + let mut target = accounts.idl.trailing_data_mut(); + let source = &accounts.buffer.trailing_data()[..buffer_len]; + require_gte!(target.len(), buffer_len); + target[..buffer_len].copy_from_slice(source); + // zero the remainder of target? + Ok(()) } } diff --git a/publish.bash b/publish.bash old mode 100644 new mode 100755 index 6e08e5db30..13ef6431f6 --- a/publish.bash +++ b/publish.bash @@ -1,16 +1,35 @@ #!/bin/bash -cargp publish -p anchor-syn -cargo publish -p anchor-attribute-access-control -cargo publish -p anchor-attribute-account -cargo publish -p anchor-attribute-constant -cargo publish -p anchor-attribute-error -cargo publish -p anchor-attribute-event -cargo publish -p anchor-attribute-interface -cargo publish -p anchor-attribute-program -cargo publish -p anchor-attribute-state -cargo publish -p anchor-derive-accounts -cargo publish -p anchor-lang -cargo publish -p anchor-spl -cargo publish -p anchor-client -cargo publish -p anchor-cli +set -e + +steps=(step0 step1 step2 step3) +step0=(anchor-syn) +step1=( + anchor-attribute-access-control + anchor-attribute-account + anchor-attribute-constant + anchor-attribute-error + anchor-attribute-event + anchor-attribute-interface + anchor-attribute-program + anchor-attribute-state + anchor-derive-accounts +) +step2=(anchor-lang) +step3=( + anchor-spl + anchor-client + anchor-cli +) + +for stepName in "${steps[@]}"; do + declare -n step="$stepName" + pids=() + for prog in "${step[@]}"; do + cargo publish -p "$prog" & + pids+=($!) + done + for pid in "${pids[@]}"; do + wait "$pid" + done +done diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 04c0017601..ca57732c92 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.16" +version = "0.25.19" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,9 +19,9 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.16", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } -solana-program = "1.10.29" +solana-program = ">=1.10.29,<1.15" spl-associated-token-account = { version = "1.1.0", features = ["no-entrypoint"], optional = true } spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } diff --git a/tests/anchor-cli-idl/test.sh b/tests/anchor-cli-idl/test.sh index 7a4c215bf0..3a351dcf5b 100755 --- a/tests/anchor-cli-idl/test.sh +++ b/tests/anchor-cli-idl/test.sh @@ -3,6 +3,27 @@ # Write a keypair for program deploy mkdir -p target/deploy cp keypairs/idl_commands_one-keypair.json target/deploy +# Generate over 20kb bytes of random data (base64 encoded), surround it with quotes, and store it in a variable +RANDOM_DATA=$(openssl rand -base64 $((10*1680)) | sed 's/.*/"&",/') + +# Create the JSON object with the "docs" field containing random data +echo '{ + "version": "0.1.0", + "name": "idl_commands_one", + "instructions": [ + { + "name": "initialize", + "docs" : [ + '"$RANDOM_DATA"' + "trailing comma begone" + ], + "accounts": [], + "args": [] + } + ] +}' > testLargeIdl.json + + echo "Building programs" @@ -23,4 +44,4 @@ echo "Running tests" anchor test --skip-deploy --skip-local-validator -trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT +trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT \ No newline at end of file diff --git a/tests/anchor-cli-idl/tests/idl.ts b/tests/anchor-cli-idl/tests/idl.ts index 59028efc2c..97780f6f56 100644 --- a/tests/anchor-cli-idl/tests/idl.ts +++ b/tests/anchor-cli-idl/tests/idl.ts @@ -4,6 +4,7 @@ import { IdlCommandsOne } from "../target/types/idl_commands_one"; import { IdlCommandsTwo } from "../target/types/idl_commands_two"; import { assert } from "chai"; import { execSync } from "child_process"; +import * as fs from "fs"; describe("Test CLI IDL commands", () => { // Configure the client to use the local cluster. @@ -62,4 +63,25 @@ describe("Test CLI IDL commands", () => { assert.equal(authority, provider.wallet.publicKey.toString()); }); + + it("Can close IDL account", async () => { + execSync(`anchor idl close ${programOne.programId}`, { stdio: "inherit" }); + const idl = await anchor.Program.fetchIdl(programOne.programId, provider); + assert.isNull(idl); + }); + + it("Can initialize super massive IDL account", async () => { + execSync( + `anchor idl init --filepath testLargeIdl.json ${programOne.programId}`, + { stdio: "inherit" } + ); + const idlActual = await anchor.Program.fetchIdl( + programOne.programId, + provider + ); + const idlExpected = JSON.parse( + fs.readFileSync("testLargeIdl.json", "utf8") + ); + assert.deepEqual(idlActual, idlExpected); + }); }); diff --git a/tests/auction-house b/tests/auction-house deleted file mode 160000 index 6c59310f0c..0000000000 --- a/tests/auction-house +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c59310f0c5caf3797cd475c5f93fe70878e589c diff --git a/tests/cfo/deps/serum-dex b/tests/cfo/deps/serum-dex deleted file mode 160000 index ed9d54a717..0000000000 --- a/tests/cfo/deps/serum-dex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ed9d54a717bec01de2924f6e6ca465f942b072aa diff --git a/tests/cfo/deps/stake b/tests/cfo/deps/stake deleted file mode 160000 index fd78344ab5..0000000000 --- a/tests/cfo/deps/stake +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd78344ab5f34c36a91bdaf8b9edf2fbd8a93510 diff --git a/tests/cfo/deps/swap b/tests/cfo/deps/swap deleted file mode 160000 index 24c6e5c984..0000000000 --- a/tests/cfo/deps/swap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 24c6e5c9845f5f4cbfd51bd239fcbe6eaa2e5337 diff --git a/tests/swap/Anchor.toml b/tests/swap/Anchor.toml deleted file mode 100644 index fa7d2b91f0..0000000000 --- a/tests/swap/Anchor.toml +++ /dev/null @@ -1,15 +0,0 @@ -[provider] -cluster = "localnet" -wallet = "~/.config/solana/id.json" - -[programs.localnet] -swap = "Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS" - -[[test.genesis]] -address = "9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin" -program = "./deps/serum-dex/dex/target/deploy/serum_dex.so" - -[scripts] -test = "yarn run mocha -t 1000000 tests/" - -[features] diff --git a/tests/swap/Cargo.toml b/tests/swap/Cargo.toml deleted file mode 100644 index 52ed11f4d9..0000000000 --- a/tests/swap/Cargo.toml +++ /dev/null @@ -1,7 +0,0 @@ -[workspace] -members = [ - "programs/*" -] -exclude = [ - "deps/serum-dex" -] \ No newline at end of file diff --git a/tests/swap/README.md b/tests/swap/README.md deleted file mode 100644 index 60778c2750..0000000000 --- a/tests/swap/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Swap - -An example swap program that provides a convenient API to the Serum orderbook -for performing instantly settled token swaps. - -## Usage - -This example requires building the Serum DEX from source, which is done using -git submodules. - -### Install Submodules - -Pull the source - -``` -git submodule init -git submodule update -``` - -### Build the DEX - -Build it - -``` -cd deps/serum-dex/dex/ && cargo build-bpf && cd ../../../ -``` - -### Run the Test - -Run the test - -``` -anchor test -``` diff --git a/tests/swap/deps/serum-dex b/tests/swap/deps/serum-dex deleted file mode 160000 index 5420646709..0000000000 --- a/tests/swap/deps/serum-dex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5420646709df6edaaea90162d4f7476328077293 diff --git a/tests/swap/migrations/deploy.js b/tests/swap/migrations/deploy.js deleted file mode 100644 index 5e3df0dc30..0000000000 --- a/tests/swap/migrations/deploy.js +++ /dev/null @@ -1,12 +0,0 @@ -// Migrations are an early feature. Currently, they're nothing more than this -// single deploy script that's invoked from the CLI, injecting a provider -// configured from the workspace's Anchor.toml. - -const anchor = require("@project-serum/anchor"); - -module.exports = async function (provider) { - // Configure client to use the provider. - anchor.setProvider(provider); - - // Add your deploy script here. -}; diff --git a/tests/swap/package.json b/tests/swap/package.json deleted file mode 100644 index f048bc10e1..0000000000 --- a/tests/swap/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "swap", - "version": "0.25.0", - "license": "(MIT OR Apache-2.0)", - "homepage": "https://github.com/coral-xyz/anchor#readme", - "bugs": { - "url": "https://github.com/coral-xyz/anchor/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/coral-xyz/anchor.git" - }, - "engines": { - "node": ">=11" - }, - "scripts": { - "test": "anchor test" - } -} diff --git a/tests/swap/programs/swap/Cargo.toml b/tests/swap/programs/swap/Cargo.toml deleted file mode 100644 index e28eeb4219..0000000000 --- a/tests/swap/programs/swap/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "swap" -version = "0.1.0" -description = "Created with Anchor" -edition = "2021" -publish = false - -[lib] -crate-type = ["cdylib", "lib"] -name = "swap" - -[features] -no-entrypoint = [] -no-idl = [] -cpi = ["no-entrypoint"] -default = [] - -[dependencies] -anchor-lang = { path = "../../../../lang" } -anchor-spl = { path = "../../../../spl", features = ["dex"] } -serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"] } diff --git a/tests/swap/programs/swap/Xargo.toml b/tests/swap/programs/swap/Xargo.toml deleted file mode 100644 index 475fb71ed1..0000000000 --- a/tests/swap/programs/swap/Xargo.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.bpfel-unknown-unknown.dependencies.std] -features = [] diff --git a/tests/swap/programs/swap/src/lib.rs b/tests/swap/programs/swap/src/lib.rs deleted file mode 100644 index 1e4fa5f44c..0000000000 --- a/tests/swap/programs/swap/src/lib.rs +++ /dev/null @@ -1,496 +0,0 @@ -//! Program to perform instantly settled token swaps on the Serum DEX. -//! -//! Before using any instruction here, a user must first create an open orders -//! account on all markets being used. This only needs to be done once. As a -//! convention established by the DEX, this should be done via the system -//! program create account instruction in the same transaction as the user's -//! first trade. Then, the DEX will lazily initialize the open orders account. - -use anchor_lang::prelude::*; -use anchor_spl::dex; -use anchor_spl::token; -use serum_dex::instruction::SelfTradeBehavior; -use serum_dex::matching::{OrderType, Side as SerumSide}; -use serum_dex::state::MarketState; -use std::num::NonZeroU64; - -declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS"); - -#[program] -pub mod swap { - use super::*; - - /// Swaps two tokens on a single A/B market, where A is the base currency - /// and B is the quote currency. This is just a direct IOC trade that - /// instantly settles. - /// - /// When side is "bid", then swaps B for A. When side is "ask", then swaps - /// A for B. - /// - /// Arguments: - /// - /// * `side` - The direction to swap. - /// * `amount` - The amount to swap *from* - /// * `min_expected_swap_amount` - The minimum amount of the *to* token the - /// client expects to receive from the swap. The instruction fails if - /// execution would result in less. - #[access_control(is_valid_swap(&ctx))] - pub fn swap<'info>( - ctx: Context<'_, '_, '_, 'info, Swap<'info>>, - side: Side, - amount: u64, - min_expected_swap_amount: u64, - ) -> Result<()> { - // Optional referral account (earns a referral fee). - let referral = ctx.remaining_accounts.iter().next().map(Clone::clone); - - // Side determines swap direction. - let (from_token, to_token) = match side { - Side::Bid => (&ctx.accounts.pc_wallet, &ctx.accounts.market.coin_wallet), - Side::Ask => (&ctx.accounts.market.coin_wallet, &ctx.accounts.pc_wallet), - }; - - // Token balances before the trade. - let from_amount_before = token::accessor::amount(from_token)?; - let to_amount_before = token::accessor::amount(to_token)?; - - // Execute trade. - let orderbook: OrderbookClient<'info> = (&*ctx.accounts).into(); - match side { - Side::Bid => orderbook.buy(amount, referral.clone())?, - Side::Ask => orderbook.sell(amount, referral.clone())?, - }; - orderbook.settle(referral)?; - - // Token balances after the trade. - let from_amount_after = token::accessor::amount(from_token)?; - let to_amount_after = token::accessor::amount(to_token)?; - - // Calculate the delta, i.e. the amount swapped. - let from_amount = from_amount_before.checked_sub(from_amount_after).unwrap(); - let to_amount = to_amount_after.checked_sub(to_amount_before).unwrap(); - - // Safety checks. - apply_risk_checks(DidSwap { - authority: *ctx.accounts.authority.key, - given_amount: amount, - min_expected_swap_amount, - from_amount, - to_amount, - spill_amount: 0, - from_mint: token::accessor::mint(from_token)?, - to_mint: token::accessor::mint(to_token)?, - quote_mint: match side { - Side::Bid => token::accessor::mint(from_token)?, - Side::Ask => token::accessor::mint(to_token)?, - }, - })?; - - Ok(()) - } - - /// Swaps two base currencies across two different markets. - /// - /// That is, suppose there are two markets, A/USD(x) and B/USD(x). - /// Then swaps token A for token B via - /// - /// * IOC (immediate or cancel) sell order on A/USD(x) market. - /// * Settle open orders to get USD(x). - /// * IOC buy order on B/USD(x) market to convert USD(x) to token B. - /// * Settle open orders to get token B. - /// - /// Arguments: - /// - /// * `amount` - The amount to swap *from*. - /// * `min_expected_swap_amount - The minimum amount of the *to* token the - /// client expects to receive from the swap. The instruction fails if - /// execution would result in less. - #[access_control(is_valid_swap_transitive(&ctx))] - pub fn swap_transitive<'info>( - ctx: Context<'_, '_, '_, 'info, SwapTransitive<'info>>, - amount: u64, - min_expected_swap_amount: u64, - ) -> Result<()> { - // Optional referral account (earns a referral fee). - let referral = ctx.remaining_accounts.iter().next().map(Clone::clone); - - // Leg 1: Sell Token A for USD(x) (or whatever quote currency is used). - let (from_amount, sell_proceeds) = { - // Token balances before the trade. - let base_before = token::accessor::amount(&ctx.accounts.from.coin_wallet)?; - let quote_before = token::accessor::amount(&ctx.accounts.pc_wallet)?; - - // Execute the trade. - let orderbook = ctx.accounts.orderbook_from(); - orderbook.sell(amount, referral.clone())?; - orderbook.settle(referral.clone())?; - - // Token balances after the trade. - let base_after = token::accessor::amount(&ctx.accounts.from.coin_wallet)?; - let quote_after = token::accessor::amount(&ctx.accounts.pc_wallet)?; - - // Report the delta. - ( - base_before.checked_sub(base_after).unwrap(), - quote_after.checked_sub(quote_before).unwrap(), - ) - }; - - // Leg 2: Buy Token B with USD(x) (or whatever quote currency is used). - let (to_amount, spill_amount) = { - // Token balances before the trade. - let base_before = token::accessor::amount(&ctx.accounts.to.coin_wallet)?; - let quote_before = token::accessor::amount(&ctx.accounts.pc_wallet)?; - - // Execute the trade. - let orderbook = ctx.accounts.orderbook_to(); - orderbook.buy(sell_proceeds, referral.clone())?; - orderbook.settle(referral)?; - - // Token balances after the trade. - let base_after = token::accessor::amount(&ctx.accounts.to.coin_wallet)?; - let quote_after = token::accessor::amount(&ctx.accounts.pc_wallet)?; - - // Report the delta. - ( - base_after.checked_sub(base_before).unwrap(), - quote_before.checked_sub(quote_after).unwrap(), - ) - }; - - // Safety checks. - apply_risk_checks(DidSwap { - given_amount: amount, - min_expected_swap_amount, - from_amount, - to_amount, - spill_amount, - from_mint: token::accessor::mint(&ctx.accounts.from.coin_wallet)?, - to_mint: token::accessor::mint(&ctx.accounts.to.coin_wallet)?, - quote_mint: token::accessor::mint(&ctx.accounts.pc_wallet)?, - authority: *ctx.accounts.authority.key, - })?; - - Ok(()) - } -} - -// Asserts the swap event is valid. -fn apply_risk_checks(event: DidSwap) -> Result<()> { - // Reject if the resulting amount is less than the client's expectation. - if event.to_amount < event.min_expected_swap_amount { - return err!(ErrorCode::SlippageExceeded); - } - emit!(event); - Ok(()) -} - -// The only constraint imposed on these accounts is that the market's base -// currency mint is not equal to the quote currency's. All other checks are -// done by the DEX on CPI. -#[derive(Accounts)] -pub struct Swap<'info> { - market: MarketAccounts<'info>, - #[account(signer)] - authority: AccountInfo<'info>, - #[account(mut)] - pc_wallet: AccountInfo<'info>, - // Programs. - dex_program: AccountInfo<'info>, - token_program: AccountInfo<'info>, - // Sysvars. - rent: AccountInfo<'info>, -} - -impl<'info> From<&Swap<'info>> for OrderbookClient<'info> { - fn from(accounts: &Swap<'info>) -> OrderbookClient<'info> { - OrderbookClient { - market: accounts.market.clone(), - authority: accounts.authority.clone(), - pc_wallet: accounts.pc_wallet.clone(), - dex_program: accounts.dex_program.clone(), - token_program: accounts.token_program.clone(), - rent: accounts.rent.clone(), - } - } -} - -// The only constraint imposed on these accounts is that the from market's -// base currency's is not equal to the to market's base currency. All other -// checks are done by the DEX on CPI (and the quote currency is ensured to be -// the same on both markets since there's only one account field for it). -#[derive(Accounts)] -pub struct SwapTransitive<'info> { - from: MarketAccounts<'info>, - to: MarketAccounts<'info>, - // Must be the authority over all open orders accounts used. - #[account(signer)] - authority: AccountInfo<'info>, - #[account(mut)] - pc_wallet: AccountInfo<'info>, - // Programs. - dex_program: AccountInfo<'info>, - token_program: AccountInfo<'info>, - // Sysvars. - rent: AccountInfo<'info>, -} - -impl<'info> SwapTransitive<'info> { - fn orderbook_from(&self) -> OrderbookClient<'info> { - OrderbookClient { - market: self.from.clone(), - authority: self.authority.clone(), - pc_wallet: self.pc_wallet.clone(), - dex_program: self.dex_program.clone(), - token_program: self.token_program.clone(), - rent: self.rent.clone(), - } - } - fn orderbook_to(&self) -> OrderbookClient<'info> { - OrderbookClient { - market: self.to.clone(), - authority: self.authority.clone(), - pc_wallet: self.pc_wallet.clone(), - dex_program: self.dex_program.clone(), - token_program: self.token_program.clone(), - rent: self.rent.clone(), - } - } -} - -// Client for sending orders to the Serum DEX. -struct OrderbookClient<'info> { - market: MarketAccounts<'info>, - authority: AccountInfo<'info>, - pc_wallet: AccountInfo<'info>, - dex_program: AccountInfo<'info>, - token_program: AccountInfo<'info>, - rent: AccountInfo<'info>, -} - -impl<'info> OrderbookClient<'info> { - // Executes the sell order portion of the swap, purchasing as much of the - // quote currency as possible for the given `base_amount`. - // - // `base_amount` is the "native" amount of the base currency, i.e., token - // amount including decimals. - fn sell(&self, base_amount: u64, referral: Option>) -> Result<()> { - let limit_price = 1; - let max_coin_qty = { - // The loaded market must be dropped before CPI. - let market = MarketState::load(&self.market.market, &dex::ID) - .map_err(|de| ProgramError::from(de))?; - coin_lots(&market, base_amount) - }; - let max_native_pc_qty = u64::MAX; - self.order_cpi( - limit_price, - max_coin_qty, - max_native_pc_qty, - Side::Ask, - referral, - ) - } - - // Executes the buy order portion of the swap, purchasing as much of the - // base currency as possible, for the given `quote_amount`. - // - // `quote_amount` is the "native" amount of the quote currency, i.e., token - // amount including decimals. - fn buy(&self, quote_amount: u64, referral: Option>) -> Result<()> { - let limit_price = u64::MAX; - let max_coin_qty = u64::MAX; - let max_native_pc_qty = quote_amount; - self.order_cpi( - limit_price, - max_coin_qty, - max_native_pc_qty, - Side::Bid, - referral, - ) - } - - // Executes a new order on the serum dex via CPI. - // - // * `limit_price` - the limit order price in lot units. - // * `max_coin_qty`- the max number of the base currency lot units. - // * `max_native_pc_qty` - the max number of quote currency in native token - // units (includes decimals). - // * `side` - bid or ask, i.e. the type of order. - // * `referral` - referral account, earning a fee. - fn order_cpi( - &self, - limit_price: u64, - max_coin_qty: u64, - max_native_pc_qty: u64, - side: Side, - referral: Option>, - ) -> Result<()> { - // Client order id is only used for cancels. Not used here so hardcode. - let client_order_id = 0; - // Limit is the dex's custom compute budge parameter, setting an upper - // bound on the number of matching cycles the program can perform - // before giving up and posting the remaining unmatched order. - let limit = 65535; - - let dex_accs = dex::NewOrderV3 { - market: self.market.market.clone(), - open_orders: self.market.open_orders.clone(), - request_queue: self.market.request_queue.clone(), - event_queue: self.market.event_queue.clone(), - market_bids: self.market.bids.clone(), - market_asks: self.market.asks.clone(), - order_payer_token_account: self.market.order_payer_token_account.clone(), - open_orders_authority: self.authority.clone(), - coin_vault: self.market.coin_vault.clone(), - pc_vault: self.market.pc_vault.clone(), - token_program: self.token_program.clone(), - rent: self.rent.clone(), - }; - let mut ctx = CpiContext::new(self.dex_program.clone(), dex_accs); - if let Some(referral) = referral { - ctx = ctx.with_remaining_accounts(vec![referral]); - } - dex::new_order_v3( - ctx, - side.into(), - NonZeroU64::new(limit_price).unwrap(), - NonZeroU64::new(max_coin_qty).unwrap(), - NonZeroU64::new(max_native_pc_qty).unwrap(), - SelfTradeBehavior::DecrementTake, - OrderType::ImmediateOrCancel, - client_order_id, - limit, - ) - } - - fn settle(&self, referral: Option>) -> Result<()> { - let settle_accs = dex::SettleFunds { - market: self.market.market.clone(), - open_orders: self.market.open_orders.clone(), - open_orders_authority: self.authority.clone(), - coin_vault: self.market.coin_vault.clone(), - pc_vault: self.market.pc_vault.clone(), - coin_wallet: self.market.coin_wallet.clone(), - pc_wallet: self.pc_wallet.clone(), - vault_signer: self.market.vault_signer.clone(), - token_program: self.token_program.clone(), - }; - let mut ctx = CpiContext::new(self.dex_program.clone(), settle_accs); - if let Some(referral) = referral { - ctx = ctx.with_remaining_accounts(vec![referral]); - } - dex::settle_funds(ctx) - } -} - -// Returns the amount of lots for the base currency of a trade with `size`. -fn coin_lots(market: &MarketState, size: u64) -> u64 { - size.checked_div(market.coin_lot_size).unwrap() -} - -// Market accounts are the accounts used to place orders against the dex minus -// common accounts, i.e., program ids, sysvars, and the `pc_wallet`. -#[derive(Accounts, Clone)] -pub struct MarketAccounts<'info> { - #[account(mut)] - market: AccountInfo<'info>, - #[account(mut)] - open_orders: AccountInfo<'info>, - #[account(mut)] - request_queue: AccountInfo<'info>, - #[account(mut)] - event_queue: AccountInfo<'info>, - #[account(mut)] - bids: AccountInfo<'info>, - #[account(mut)] - asks: AccountInfo<'info>, - // The `spl_token::Account` that funds will be taken from, i.e., transferred - // from the user into the market's vault. - // - // For bids, this is the base currency. For asks, the quote. - #[account(mut)] - order_payer_token_account: AccountInfo<'info>, - // Also known as the "base" currency. For a given A/B market, - // this is the vault for the A mint. - #[account(mut)] - coin_vault: AccountInfo<'info>, - // Also known as the "quote" currency. For a given A/B market, - // this is the vault for the B mint. - #[account(mut)] - pc_vault: AccountInfo<'info>, - // PDA owner of the DEX's token accounts for base + quote currencies. - vault_signer: AccountInfo<'info>, - // User wallets. - #[account(mut)] - coin_wallet: AccountInfo<'info>, -} - -#[derive(AnchorSerialize, AnchorDeserialize)] -pub enum Side { - Bid, - Ask, -} - -impl From for SerumSide { - fn from(side: Side) -> SerumSide { - match side { - Side::Bid => SerumSide::Bid, - Side::Ask => SerumSide::Ask, - } - } -} - -// Access control modifiers. - -fn is_valid_swap(ctx: &Context) -> Result<()> { - _is_valid_swap(&ctx.accounts.market.coin_wallet, &ctx.accounts.pc_wallet) -} - -fn is_valid_swap_transitive(ctx: &Context) -> Result<()> { - _is_valid_swap(&ctx.accounts.from.coin_wallet, &ctx.accounts.to.coin_wallet) -} - -// Validates the tokens being swapped are of different mints. -fn _is_valid_swap<'info>(from: &AccountInfo<'info>, to: &AccountInfo<'info>) -> Result<()> { - let from_token_mint = token::accessor::mint(from)?; - let to_token_mint = token::accessor::mint(to)?; - if from_token_mint == to_token_mint { - return err!(ErrorCode::SwapTokensCannotMatch); - } - Ok(()) -} - -// Event emitted when a swap occurs for two base currencies on two different -// markets (quoted in the same token). -#[event] -pub struct DidSwap { - // User given (max) amount to swap. - pub given_amount: u64, - // The minimum amount of the *to* token expected to be received from - // executing the swap. - pub min_expected_swap_amount: u64, - // Amount of the `from` token sold. - pub from_amount: u64, - // Amount of the `to` token purchased. - pub to_amount: u64, - // Amount of the quote currency accumulated from the swap. - pub spill_amount: u64, - // Mint sold. - pub from_mint: Pubkey, - // Mint purchased. - pub to_mint: Pubkey, - // Mint of the token used as the quote currency in the two markets used - // for swapping. - pub quote_mint: Pubkey, - // User that signed the transaction. - pub authority: Pubkey, -} - -#[error_code] -pub enum ErrorCode { - #[msg("The tokens being swapped must have different mints")] - SwapTokensCannotMatch, - #[msg("Slippage tolerance exceeded")] - SlippageExceeded, -} diff --git a/tests/swap/tests/swap.js b/tests/swap/tests/swap.js deleted file mode 100644 index 21dd0778da..0000000000 --- a/tests/swap/tests/swap.js +++ /dev/null @@ -1,315 +0,0 @@ -const { assert } = require("chai"); -const anchor = require("@project-serum/anchor"); -const BN = anchor.BN; -const OpenOrders = require("@project-serum/serum").OpenOrders; -const TOKEN_PROGRAM_ID = require("@solana/spl-token").TOKEN_PROGRAM_ID; -const serumCmn = require("@project-serum/common"); -const utils = require("./utils"); - -// Taker fee rate (bps). -const TAKER_FEE = 0.0022; - -describe("swap", () => { - // Configure the client to use the local cluster. - const provider = anchor.AnchorProvider.env(); - // hack so we don't have to update serum-common library - // to the new AnchorProvider class and Provider interface - provider.send = provider.sendAndConfirm; - anchor.setProvider(provider); - - // Swap program client. - const program = anchor.workspace.Swap; - - // Accounts used to setup the orderbook. - let ORDERBOOK_ENV, - // Accounts used for A -> USDC swap transactions. - SWAP_A_USDC_ACCOUNTS, - // Accounts used for USDC -> A swap transactions. - SWAP_USDC_A_ACCOUNTS, - // Serum DEX vault PDA for market A/USDC. - marketAVaultSigner, - // Serum DEX vault PDA for market B/USDC. - marketBVaultSigner; - - // Open orders accounts on the two markets for the provider. - const openOrdersA = anchor.web3.Keypair.generate(); - const openOrdersB = anchor.web3.Keypair.generate(); - - it("BOILERPLATE: Sets up two markets with resting orders", async () => { - ORDERBOOK_ENV = await utils.setupTwoMarkets({ - provider: program.provider, - }); - }); - - it("BOILERPLATE: Sets up reusable accounts", async () => { - const marketA = ORDERBOOK_ENV.marketA; - const marketB = ORDERBOOK_ENV.marketB; - - const [vaultSignerA] = await utils.getVaultOwnerAndNonce( - marketA._decoded.ownAddress - ); - const [vaultSignerB] = await utils.getVaultOwnerAndNonce( - marketB._decoded.ownAddress - ); - marketAVaultSigner = vaultSignerA; - marketBVaultSigner = vaultSignerB; - - SWAP_USDC_A_ACCOUNTS = { - market: { - market: marketA._decoded.ownAddress, - requestQueue: marketA._decoded.requestQueue, - eventQueue: marketA._decoded.eventQueue, - bids: marketA._decoded.bids, - asks: marketA._decoded.asks, - coinVault: marketA._decoded.baseVault, - pcVault: marketA._decoded.quoteVault, - vaultSigner: marketAVaultSigner, - // User params. - openOrders: openOrdersA.publicKey, - orderPayerTokenAccount: ORDERBOOK_ENV.godUsdc, - coinWallet: ORDERBOOK_ENV.godA, - }, - pcWallet: ORDERBOOK_ENV.godUsdc, - authority: program.provider.wallet.publicKey, - dexProgram: utils.DEX_PID, - tokenProgram: TOKEN_PROGRAM_ID, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }; - SWAP_A_USDC_ACCOUNTS = { - ...SWAP_USDC_A_ACCOUNTS, - market: { - ...SWAP_USDC_A_ACCOUNTS.market, - orderPayerTokenAccount: ORDERBOOK_ENV.godA, - }, - }; - }); - - it("Swaps from USDC to Token A", async () => { - const marketA = ORDERBOOK_ENV.marketA; - - // Swap exactly enough USDC to get 1.2 A tokens (best offer price is 6.041 USDC). - const expectedResultantAmount = 7.2; - const bestOfferPrice = 6.041; - const amountToSpend = expectedResultantAmount * bestOfferPrice; - const swapAmount = new BN((amountToSpend / (1 - TAKER_FEE)) * 10 ** 6); - - const [tokenAChange, usdcChange] = await withBalanceChange( - program.provider, - [ORDERBOOK_ENV.godA, ORDERBOOK_ENV.godUsdc], - async () => { - await program.rpc.swap(Side.Bid, swapAmount, new BN(1.0), { - accounts: SWAP_USDC_A_ACCOUNTS, - instructions: [ - // First order to this market so one must create the open orders account. - await OpenOrders.makeCreateAccountTransaction( - program.provider.connection, - marketA._decoded.ownAddress, - program.provider.wallet.publicKey, - openOrdersA.publicKey, - utils.DEX_PID - ), - // Might as well create the second open orders account while we're here. - // In prod, this should actually be done within the same tx as an - // order to market B. - await OpenOrders.makeCreateAccountTransaction( - program.provider.connection, - ORDERBOOK_ENV.marketB._decoded.ownAddress, - program.provider.wallet.publicKey, - openOrdersB.publicKey, - utils.DEX_PID - ), - ], - signers: [openOrdersA, openOrdersB], - }); - } - ); - - assert.strictEqual(tokenAChange, expectedResultantAmount); - assert.strictEqual(usdcChange, -swapAmount.toNumber() / 10 ** 6); - }); - - it("Swaps from Token A to USDC", async () => { - const marketA = ORDERBOOK_ENV.marketA; - - // Swap out A tokens for USDC. - const swapAmount = 8.1; - const bestBidPrice = 6.004; - const amountToFill = swapAmount * bestBidPrice; - const takerFee = 0.0022; - const resultantAmount = new BN(amountToFill * (1 - TAKER_FEE) * 10 ** 6); - - const [tokenAChange, usdcChange] = await withBalanceChange( - program.provider, - [ORDERBOOK_ENV.godA, ORDERBOOK_ENV.godUsdc], - async () => { - await program.rpc.swap( - Side.Ask, - new BN(swapAmount * 10 ** 6), - new BN(swapAmount), - { - accounts: SWAP_A_USDC_ACCOUNTS, - } - ); - } - ); - - assert.strictEqual(tokenAChange, -swapAmount); - assert.strictEqual(usdcChange, resultantAmount.toNumber() / 10 ** 6); - }); - - it("Swaps from Token A to Token B", async () => { - const marketA = ORDERBOOK_ENV.marketA; - const marketB = ORDERBOOK_ENV.marketB; - const swapAmount = 10; - const [tokenAChange, tokenBChange, usdcChange] = await withBalanceChange( - program.provider, - [ORDERBOOK_ENV.godA, ORDERBOOK_ENV.godB, ORDERBOOK_ENV.godUsdc], - async () => { - // Perform the actual swap. - await program.rpc.swapTransitive( - new BN(swapAmount * 10 ** 6), - new BN(swapAmount - 1), - { - accounts: { - from: { - market: marketA._decoded.ownAddress, - requestQueue: marketA._decoded.requestQueue, - eventQueue: marketA._decoded.eventQueue, - bids: marketA._decoded.bids, - asks: marketA._decoded.asks, - coinVault: marketA._decoded.baseVault, - pcVault: marketA._decoded.quoteVault, - vaultSigner: marketAVaultSigner, - // User params. - openOrders: openOrdersA.publicKey, - // Swapping from A -> USDC. - orderPayerTokenAccount: ORDERBOOK_ENV.godA, - coinWallet: ORDERBOOK_ENV.godA, - }, - to: { - market: marketB._decoded.ownAddress, - requestQueue: marketB._decoded.requestQueue, - eventQueue: marketB._decoded.eventQueue, - bids: marketB._decoded.bids, - asks: marketB._decoded.asks, - coinVault: marketB._decoded.baseVault, - pcVault: marketB._decoded.quoteVault, - vaultSigner: marketBVaultSigner, - // User params. - openOrders: openOrdersB.publicKey, - // Swapping from USDC -> B. - orderPayerTokenAccount: ORDERBOOK_ENV.godUsdc, - coinWallet: ORDERBOOK_ENV.godB, - }, - pcWallet: ORDERBOOK_ENV.godUsdc, - authority: program.provider.wallet.publicKey, - dexProgram: utils.DEX_PID, - tokenProgram: TOKEN_PROGRAM_ID, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }, - } - ); - } - ); - - assert.strictEqual(tokenAChange, -swapAmount); - // TODO: calculate this dynamically from the swap amount. - assert.strictEqual(tokenBChange, 9.8); - assert.strictEqual(usdcChange, 0); - }); - - it("Swaps from Token B to Token A", async () => { - const marketA = ORDERBOOK_ENV.marketA; - const marketB = ORDERBOOK_ENV.marketB; - const swapAmount = 23; - const [tokenAChange, tokenBChange, usdcChange] = await withBalanceChange( - program.provider, - [ORDERBOOK_ENV.godA, ORDERBOOK_ENV.godB, ORDERBOOK_ENV.godUsdc], - async () => { - // Perform the actual swap. - await program.rpc.swapTransitive( - new BN(swapAmount * 10 ** 6), - new BN(swapAmount - 1), - { - accounts: { - from: { - market: marketB._decoded.ownAddress, - requestQueue: marketB._decoded.requestQueue, - eventQueue: marketB._decoded.eventQueue, - bids: marketB._decoded.bids, - asks: marketB._decoded.asks, - coinVault: marketB._decoded.baseVault, - pcVault: marketB._decoded.quoteVault, - vaultSigner: marketBVaultSigner, - // User params. - openOrders: openOrdersB.publicKey, - // Swapping from B -> USDC. - orderPayerTokenAccount: ORDERBOOK_ENV.godB, - coinWallet: ORDERBOOK_ENV.godB, - }, - to: { - market: marketA._decoded.ownAddress, - requestQueue: marketA._decoded.requestQueue, - eventQueue: marketA._decoded.eventQueue, - bids: marketA._decoded.bids, - asks: marketA._decoded.asks, - coinVault: marketA._decoded.baseVault, - pcVault: marketA._decoded.quoteVault, - vaultSigner: marketAVaultSigner, - // User params. - openOrders: openOrdersA.publicKey, - // Swapping from USDC -> A. - orderPayerTokenAccount: ORDERBOOK_ENV.godUsdc, - coinWallet: ORDERBOOK_ENV.godA, - }, - pcWallet: ORDERBOOK_ENV.godUsdc, - authority: program.provider.wallet.publicKey, - dexProgram: utils.DEX_PID, - tokenProgram: TOKEN_PROGRAM_ID, - rent: anchor.web3.SYSVAR_RENT_PUBKEY, - }, - } - ); - } - ); - - // TODO: calculate this dynamically from the swap amount. - assert.strictEqual(tokenAChange, 22.6); - assert.strictEqual(tokenBChange, -swapAmount); - assert.strictEqual(usdcChange, 0); - }); -}); - -// Side rust enum used for the program's RPC API. -const Side = { - Bid: { bid: {} }, - Ask: { ask: {} }, -}; - -// Executes a closure. Returning the change in balances from before and after -// its execution. -async function withBalanceChange(provider, addrs, fn) { - const beforeBalances = []; - for (let k = 0; k < addrs.length; k += 1) { - beforeBalances.push( - (await serumCmn.getTokenAccount(provider, addrs[k])).amount - ); - } - - await fn(); - - const afterBalances = []; - for (let k = 0; k < addrs.length; k += 1) { - afterBalances.push( - (await serumCmn.getTokenAccount(provider, addrs[k])).amount - ); - } - - const deltas = []; - for (let k = 0; k < addrs.length; k += 1) { - deltas.push( - (afterBalances[k].toNumber() - beforeBalances[k].toNumber()) / 10 ** 6 - ); - } - return deltas; -} diff --git a/tests/swap/tests/utils/index.js b/tests/swap/tests/utils/index.js deleted file mode 100644 index 3750305179..0000000000 --- a/tests/swap/tests/utils/index.js +++ /dev/null @@ -1,513 +0,0 @@ -// Boilerplate utils to bootstrap an orderbook for testing on a localnet. -// not super relevant to the point of the example, though may be useful to -// include into your own workspace for testing. -// -// TODO: Modernize all these apis. This is all quite clunky. - -const Token = require("@solana/spl-token").Token; -const TOKEN_PROGRAM_ID = require("@solana/spl-token").TOKEN_PROGRAM_ID; -const TokenInstructions = require("@project-serum/serum").TokenInstructions; -const Market = require("@project-serum/serum").Market; -const DexInstructions = require("@project-serum/serum").DexInstructions; -const web3 = require("@project-serum/anchor").web3; -const Connection = web3.Connection; -const BN = require("@project-serum/anchor").BN; -const serumCmn = require("@project-serum/common"); -const Account = web3.Account; -const Transaction = web3.Transaction; -const PublicKey = web3.PublicKey; -const SystemProgram = web3.SystemProgram; -const DEX_PID = new PublicKey("9xQeWvG816bUx9EPjHmaT23yvVM2ZWbrrpZb9PusVFin"); - -async function setupTwoMarkets({ provider }) { - // Setup mints with initial tokens owned by the provider. - const decimals = 6; - const [MINT_A, GOD_A] = await serumCmn.createMintAndVault( - provider, - new BN(1000000000000000), - undefined, - decimals - ); - const [MINT_B, GOD_B] = await serumCmn.createMintAndVault( - provider, - new BN(1000000000000000), - undefined, - decimals - ); - const [USDC, GOD_USDC] = await serumCmn.createMintAndVault( - provider, - new BN(1000000000000000), - undefined, - decimals - ); - - // Create a funded account to act as market maker. - const amount = 100000 * 10 ** decimals; - const marketMaker = await fundAccount({ - provider, - mints: [ - { god: GOD_A, mint: MINT_A, amount, decimals }, - { god: GOD_B, mint: MINT_B, amount, decimals }, - { god: GOD_USDC, mint: USDC, amount, decimals }, - ], - }); - - // Setup A/USDC and B/USDC markets with resting orders. - const asks = [ - [6.041, 7.8], - [6.051, 72.3], - [6.055, 5.4], - [6.067, 15.7], - [6.077, 390.0], - [6.09, 24.0], - [6.11, 36.3], - [6.133, 300.0], - [6.167, 687.8], - ]; - const bids = [ - [6.004, 8.5], - [5.995, 12.9], - [5.987, 6.2], - [5.978, 15.3], - [5.965, 82.8], - [5.961, 25.4], - ]; - - MARKET_A_USDC = await setupMarket({ - baseMint: MINT_A, - quoteMint: USDC, - marketMaker: { - account: marketMaker.account, - baseToken: marketMaker.tokens[MINT_A.toString()], - quoteToken: marketMaker.tokens[USDC.toString()], - }, - bids, - asks, - provider, - }); - MARKET_B_USDC = await setupMarket({ - baseMint: MINT_B, - quoteMint: USDC, - marketMaker: { - account: marketMaker.account, - baseToken: marketMaker.tokens[MINT_B.toString()], - quoteToken: marketMaker.tokens[USDC.toString()], - }, - bids, - asks, - provider, - }); - - return { - marketA: MARKET_A_USDC, - marketB: MARKET_B_USDC, - marketMaker, - mintA: MINT_A, - mintB: MINT_B, - usdc: USDC, - godA: GOD_A, - godB: GOD_B, - godUsdc: GOD_USDC, - }; -} - -// Creates everything needed for an orderbook to be running -// -// * Mints for both the base and quote currencies. -// * Lists the market. -// * Provides resting orders on the market. -// -// Returns a client that can be used to interact with the market -// (and some other data, e.g., the mints and market maker account). -async function initOrderbook({ provider, bids, asks }) { - if (!bids || !asks) { - asks = [ - [6.041, 7.8], - [6.051, 72.3], - [6.055, 5.4], - [6.067, 15.7], - [6.077, 390.0], - [6.09, 24.0], - [6.11, 36.3], - [6.133, 300.0], - [6.167, 687.8], - ]; - bids = [ - [6.004, 8.5], - [5.995, 12.9], - [5.987, 6.2], - [5.978, 15.3], - [5.965, 82.8], - [5.961, 25.4], - ]; - } - // Create base and quote currency mints. - const decimals = 6; - const [MINT_A, GOD_A] = await serumCmn.createMintAndVault( - provider, - new BN(1000000000000000), - undefined, - decimals - ); - const [USDC, GOD_USDC] = await serumCmn.createMintAndVault( - provider, - new BN(1000000000000000), - undefined, - decimals - ); - - // Create a funded account to act as market maker. - const amount = 100000 * 10 ** decimals; - const marketMaker = await fundAccount({ - provider, - mints: [ - { god: GOD_A, mint: MINT_A, amount, decimals }, - { god: GOD_USDC, mint: USDC, amount, decimals }, - ], - }); - - marketClient = await setupMarket({ - baseMint: MINT_A, - quoteMint: USDC, - marketMaker: { - account: marketMaker.account, - baseToken: marketMaker.tokens[MINT_A.toString()], - quoteToken: marketMaker.tokens[USDC.toString()], - }, - bids, - asks, - provider, - }); - - return { - marketClient, - baseMint: MINT_A, - quoteMint: USDC, - marketMaker, - }; -} - -async function fundAccount({ provider, mints }) { - const MARKET_MAKER = new Account(); - - const marketMaker = { - tokens: {}, - account: MARKET_MAKER, - }; - - // Transfer lamports to market maker. - await provider.sendAndConfirm( - (() => { - const tx = new Transaction(); - tx.add( - SystemProgram.transfer({ - fromPubkey: provider.wallet.publicKey, - toPubkey: MARKET_MAKER.publicKey, - lamports: 100000000000, - }) - ); - return tx; - })() - ); - - // Transfer SPL tokens to the market maker. - for (let k = 0; k < mints.length; k += 1) { - const { mint, god, amount, decimals } = mints[k]; - let MINT_A = mint; - let GOD_A = god; - // Setup token accounts owned by the market maker. - const mintAClient = new Token( - provider.connection, - MINT_A, - TOKEN_PROGRAM_ID, - provider.wallet.payer // node only - ); - const marketMakerTokenA = await mintAClient.createAccount( - MARKET_MAKER.publicKey - ); - - await provider.sendAndConfirm( - (() => { - const tx = new Transaction(); - tx.add( - Token.createTransferCheckedInstruction( - TOKEN_PROGRAM_ID, - GOD_A, - MINT_A, - marketMakerTokenA, - provider.wallet.publicKey, - [], - amount, - decimals - ) - ); - return tx; - })() - ); - - marketMaker.tokens[mint.toString()] = marketMakerTokenA; - } - - return marketMaker; -} - -async function setupMarket({ - provider, - marketMaker, - baseMint, - quoteMint, - bids, - asks, -}) { - const marketAPublicKey = await listMarket({ - connection: provider.connection, - wallet: provider.wallet, - baseMint: baseMint, - quoteMint: quoteMint, - baseLotSize: 100000, - quoteLotSize: 100, - dexProgramId: DEX_PID, - feeRateBps: 0, - }); - const MARKET_A_USDC = await Market.load( - provider.connection, - marketAPublicKey, - { commitment: "processed" }, - DEX_PID - ); - for (let k = 0; k < asks.length; k += 1) { - let ask = asks[k]; - const { transaction, signers } = - await MARKET_A_USDC.makePlaceOrderTransaction(provider.connection, { - owner: marketMaker.account, - payer: marketMaker.baseToken, - side: "sell", - price: ask[0], - size: ask[1], - orderType: "postOnly", - clientId: undefined, - openOrdersAddressKey: undefined, - openOrdersAccount: undefined, - feeDiscountPubkey: null, - selfTradeBehavior: "abortTransaction", - }); - await provider.sendAndConfirm( - transaction, - signers.concat(marketMaker.account) - ); - } - - for (let k = 0; k < bids.length; k += 1) { - let bid = bids[k]; - const { transaction, signers } = - await MARKET_A_USDC.makePlaceOrderTransaction(provider.connection, { - owner: marketMaker.account, - payer: marketMaker.quoteToken, - side: "buy", - price: bid[0], - size: bid[1], - orderType: "postOnly", - clientId: undefined, - openOrdersAddressKey: undefined, - openOrdersAccount: undefined, - feeDiscountPubkey: null, - selfTradeBehavior: "abortTransaction", - }); - await provider.sendAndConfirm( - transaction, - signers.concat(marketMaker.account) - ); - } - - return MARKET_A_USDC; -} - -async function listMarket({ - connection, - wallet, - baseMint, - quoteMint, - baseLotSize, - quoteLotSize, - dexProgramId, - feeRateBps, -}) { - const market = new Account(); - const requestQueue = new Account(); - const eventQueue = new Account(); - const bids = new Account(); - const asks = new Account(); - const baseVault = new Account(); - const quoteVault = new Account(); - const quoteDustThreshold = new BN(100); - - const [vaultOwner, vaultSignerNonce] = await getVaultOwnerAndNonce( - market.publicKey, - dexProgramId - ); - - const tx1 = new Transaction(); - tx1.add( - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: baseVault.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(165), - space: 165, - programId: TOKEN_PROGRAM_ID, - }), - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: quoteVault.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(165), - space: 165, - programId: TOKEN_PROGRAM_ID, - }), - TokenInstructions.initializeAccount({ - account: baseVault.publicKey, - mint: baseMint, - owner: vaultOwner, - }), - TokenInstructions.initializeAccount({ - account: quoteVault.publicKey, - mint: quoteMint, - owner: vaultOwner, - }) - ); - - const tx2 = new Transaction(); - tx2.add( - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: market.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption( - Market.getLayout(dexProgramId).span - ), - space: Market.getLayout(dexProgramId).span, - programId: dexProgramId, - }), - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: requestQueue.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(5120 + 12), - space: 5120 + 12, - programId: dexProgramId, - }), - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: eventQueue.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(262144 + 12), - space: 262144 + 12, - programId: dexProgramId, - }), - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: bids.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12), - space: 65536 + 12, - programId: dexProgramId, - }), - SystemProgram.createAccount({ - fromPubkey: wallet.publicKey, - newAccountPubkey: asks.publicKey, - lamports: await connection.getMinimumBalanceForRentExemption(65536 + 12), - space: 65536 + 12, - programId: dexProgramId, - }), - DexInstructions.initializeMarket({ - market: market.publicKey, - requestQueue: requestQueue.publicKey, - eventQueue: eventQueue.publicKey, - bids: bids.publicKey, - asks: asks.publicKey, - baseVault: baseVault.publicKey, - quoteVault: quoteVault.publicKey, - baseMint, - quoteMint, - baseLotSize: new BN(baseLotSize), - quoteLotSize: new BN(quoteLotSize), - feeRateBps, - vaultSignerNonce, - quoteDustThreshold, - programId: dexProgramId, - }) - ); - - const signedTransactions = await signTransactions({ - transactionsAndSigners: [ - { transaction: tx1, signers: [baseVault, quoteVault] }, - { - transaction: tx2, - signers: [market, requestQueue, eventQueue, bids, asks], - }, - ], - wallet, - connection, - }); - for (let signedTransaction of signedTransactions) { - await sendAndConfirmRawTransaction( - connection, - signedTransaction.serialize() - ); - } - const acc = await connection.getAccountInfo(market.publicKey); - - return market.publicKey; -} - -async function signTransactions({ - transactionsAndSigners, - wallet, - connection, -}) { - const blockhash = (await connection.getRecentBlockhash("finalized")) - .blockhash; - transactionsAndSigners.forEach(({ transaction, signers = [] }) => { - transaction.recentBlockhash = blockhash; - transaction.setSigners( - wallet.publicKey, - ...signers.map((s) => s.publicKey) - ); - if (signers.length > 0) { - transaction.partialSign(...signers); - } - }); - return await wallet.signAllTransactions( - transactionsAndSigners.map(({ transaction }) => transaction) - ); -} - -async function sendAndConfirmRawTransaction( - connection, - raw, - commitment = "processed" -) { - let tx = await connection.sendRawTransaction(raw, { - skipPreflight: true, - }); - return await connection.confirmTransaction(tx, commitment); -} - -async function getVaultOwnerAndNonce(marketPublicKey, dexProgramId = DEX_PID) { - const nonce = new BN(0); - while (nonce.toNumber() < 255) { - try { - const vaultOwner = await PublicKey.createProgramAddress( - [marketPublicKey.toBuffer(), nonce.toArrayLike(Buffer, "le", 8)], - dexProgramId - ); - return [vaultOwner, nonce]; - } catch (e) { - nonce.iaddn(1); - } - } - throw new Error("Unable to find nonce"); -} - -module.exports = { - fundAccount, - setupMarket, - initOrderbook, - setupTwoMarkets, - DEX_PID, - getVaultOwnerAndNonce, -}; From efc673c00a7f68c3c691b5a0cba76a6868f6cecd Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Thu, 24 Aug 2023 13:24:26 -0500 Subject: [PATCH 29/45] Bumped solana version --- cli/Cargo.toml | 10 +++++----- client/Cargo.toml | 6 +++--- client/example/Cargo.toml | 2 +- lang/Cargo.toml | 2 +- spl/Cargo.toml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 10ccac4971..fccc51469b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -35,11 +35,11 @@ semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0" shellexpand = "2.1.0" -solana-cli-config = ">=1.10.29,<1.15" -solana-client = ">=1.10.29,<1.15" -solana-faucet = ">=1.10.29,<1.15" -solana-program = ">=1.10.29,<1.15" -solana-sdk = ">=1.10.29,<1.15" +solana-cli-config = ">=1.10.29,<1.17" +solana-client = ">=1.10.29,<1.17" +solana-faucet = ">=1.10.29,<1.17" +solana-program = ">=1.10.29,<1.17" +solana-sdk = ">=1.10.29,<1.17" syn = { version = "1.0.60", features = ["full", "extra-traits"] } tar = "0.4.35" tokio = "1.0" diff --git a/client/Cargo.toml b/client/Cargo.toml index 47430b5fa0..50688db442 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -15,8 +15,8 @@ anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } -solana-account-decoder = ">=1.10.29,<1.15" -solana-client = ">=1.10.29,<1.15" -solana-sdk = ">=1.10.29,<1.15" +solana-account-decoder = ">=1.10.29,<1.17" +solana-client = ">=1.10.29,<1.17" +solana-sdk = ">=1.10.29,<1.17" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index b1730da55c..027ca38b19 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -16,4 +16,4 @@ shellexpand = "2.1.0" anyhow = "1.0.32" rand = "0.7.3" clap = { version = "3.0.0-rc.0", features = ["derive"] } -solana-sdk = ">=1.10.29,<1.15" +solana-sdk = ">=1.10.29,<1.17" diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 79e5babbb8..eb4fda7770 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -40,5 +40,5 @@ base64 = "0.13.0" bincode = "1.3.3" borsh = "0.9.3" bytemuck = "1.4.0" -solana-program = ">=1.10.29,<1.15" +solana-program = ">=1.10.29,<1.17" thiserror = "1.0.20" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index ca57732c92..5f4ce7a3c8 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -22,6 +22,6 @@ dex = ["serum_dex"] anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } -solana-program = ">=1.10.29,<1.15" +solana-program = ">=1.10.29,<1.17" spl-associated-token-account = { version = "1.1.0", features = ["no-entrypoint"], optional = true } spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } From d8fed937b67fa06bb24c744831b47ab71429e106 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Thu, 24 Aug 2023 13:26:19 -0500 Subject: [PATCH 30/45] Bumped versions --- Cargo.lock | 28 ++++++++++++------------ cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- lang/Cargo.toml | 20 ++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8bd61b8048..c4d18ece8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,7 +97,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -109,7 +109,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -122,7 +122,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "proc-macro2 1.0.64", @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -152,7 +152,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -164,7 +164,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -175,7 +175,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-client", "anchor-lang", @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-lang", "anyhow", @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", @@ -246,7 +246,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -268,7 +268,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.19" +version = "0.25.20" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index fccc51469b..3001ef3b14 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.19" +version = "0.25.20" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.19", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.19", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.20", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 50688db442..43556d14ce 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index eb4fda7770..a3a0c44534 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.19", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.19", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.19", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.20", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.20", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 11402ee5ce..b2bb236762 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 0f035b3d91..ba30dddac9 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 7f024de574..75d624c32b 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index a5ed7b92c2..7abb35dd41 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 33ec0e2084..095810de13 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 733341fd6a..7cb559025e 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 12f980e887..60db12f9b6 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index d4b9c8597a..9100d6819c 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index d00334754a..af2a73a647 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.19", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 11a9361af5..ec382b6ec3 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 5f4ce7a3c8..6a0befce1c 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.19" +version = "0.25.20" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.19", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = ">=1.10.29,<1.17" From 73eefc0092926bf27dec8e4bff5a7ccb62e9fa12 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Thu, 24 Aug 2023 13:28:51 -0500 Subject: [PATCH 31/45] Ran cargo update --- Cargo.lock | 890 ++++++++++++++++++++++++++++------------------------- 1 file changed, 469 insertions(+), 421 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c4d18ece8c..a425d8b7f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,6 +12,15 @@ dependencies = [ "regex", ] +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -67,9 +76,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -101,8 +110,8 @@ version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "regex", "syn 1.0.109", ] @@ -114,8 +123,8 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "rustversion", "syn 1.0.109", ] @@ -125,7 +134,7 @@ name = "anchor-attribute-constant" version = "0.25.20" dependencies = [ "anchor-syn", - "proc-macro2 1.0.64", + "proc-macro2 1.0.66", "syn 1.0.109", ] @@ -134,8 +143,8 @@ name = "anchor-attribute-error" version = "0.25.20" dependencies = [ "anchor-syn", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -145,8 +154,8 @@ version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -157,8 +166,8 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -168,8 +177,8 @@ version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -179,8 +188,8 @@ version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -239,8 +248,8 @@ version = "0.25.20" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -285,9 +294,9 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.64", + "proc-macro2 1.0.66", "proc-macro2-diagnostics", - "quote 1.0.29", + "quote 1.0.33", "serde", "serde_json", "sha2 0.9.9", @@ -321,9 +330,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -350,7 +359,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.23", + "time 0.3.27", ] [[package]] @@ -359,8 +368,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", "synstructure", ] @@ -371,8 +380,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -384,9 +393,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" dependencies = [ "brotli", "flate2", @@ -407,13 +416,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -433,6 +442,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.12.3" @@ -472,6 +496,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitmaps" version = "2.1.0" @@ -539,7 +569,7 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.64", + "proc-macro2 1.0.66", "syn 1.0.109", ] @@ -549,8 +579,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -560,8 +590,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -629,9 +659,9 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -669,11 +699,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -725,7 +756,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -739,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", "indexmap 1.9.3", @@ -757,8 +788,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -966,11 +997,17 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivation-path" version = "0.2.0" @@ -1065,9 +1102,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -1136,9 +1173,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1148,9 +1185,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1170,8 +1207,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -1182,9 +1219,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -1202,8 +1239,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -1228,9 +1265,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1255,12 +1292,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "feature-probe" @@ -1280,21 +1314,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1384,9 +1418,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -1475,11 +1509,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1614,9 +1654,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1641,7 +1681,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1650,15 +1690,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls", + "rustls 0.21.6", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -1764,26 +1805,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -1810,9 +1831,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -1934,9 +1955,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1950,9 +1971,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -2032,34 +2053,24 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] name = "mpl-token-auth-rules" -version = "1.3.0" +version = "1.4.3-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24dcb2b0ec0e9246f6f035e0336ba3359c21f6928dfd90281999e2c8e8ab53eb" +checksum = "81a34d740606a10a9dac7507d0c9025d72e0ce311c68ae85b6634982cf69a9c6" dependencies = [ "borsh", - "mpl-token-metadata-context-derive", + "bytemuck", + "mpl-token-metadata-context-derive 0.2.1", "num-derive", "num-traits", "rmp-serde", @@ -2072,14 +2083,14 @@ dependencies = [ [[package]] name = "mpl-token-metadata" -version = "1.13.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803d414222c1b648d14559d6d1aaa5fa6f7dfdde3a26c76c331a87d6124aeb5e" +checksum = "654976568c99887549e1291e7b7e55ae31a70732e56ebb25cb1cdfc08c018333" dependencies = [ "arrayref", "borsh", "mpl-token-auth-rules", - "mpl-token-metadata-context-derive", + "mpl-token-metadata-context-derive 0.3.0", "mpl-utils", "num-derive", "num-traits", @@ -2096,20 +2107,29 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" dependencies = [ - "quote 1.0.29", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "mpl-token-metadata-context-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a739019e11d93661a64ef5fe108ab17c79b35961e944442ff6efdd460ad01a" +dependencies = [ + "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "mpl-utils" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822133b6cba8f9a43e5e0e189813be63dd795858f54155c729833be472ffdb51" +checksum = "3f2e4f92aec317d5853c0cc4c03c55f5178511c45bb3dbb441aea63117bf3dc9" dependencies = [ "arrayref", - "borsh", "solana-program", - "spl-token", + "spl-token-2022", ] [[package]] @@ -2136,7 +2156,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -2152,15 +2172,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num" version = "0.2.1" @@ -2188,9 +2199,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2213,8 +2224,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -2253,9 +2264,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -2286,8 +2297,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", ] @@ -2297,6 +2308,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ + "memchr", +] + [[package]] name = "oid-registry" version = "0.6.1" @@ -2320,11 +2340,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2339,9 +2359,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -2352,9 +2372,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -2368,17 +2388,6 @@ version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -2386,21 +2395,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2413,14 +2408,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pathdiff" @@ -2472,9 +2467,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -2552,8 +2547,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", "version_check", ] @@ -2564,8 +2559,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "version_check", ] @@ -2580,9 +2575,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -2593,8 +2588,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", "version_check", "yansi", @@ -2621,7 +2616,7 @@ dependencies = [ "fxhash", "quinn-proto", "quinn-udp", - "rustls", + "rustls 0.20.8", "thiserror", "tokio", "tracing", @@ -2638,7 +2633,7 @@ dependencies = [ "fxhash", "rand 0.8.5", "ring", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "rustls-pemfile 0.2.1", "slab", @@ -2657,7 +2652,7 @@ dependencies = [ "futures-util", "libc", "quinn-proto", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -2673,11 +2668,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.64", + "proc-macro2 1.0.66", ] [[package]] @@ -2790,7 +2785,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.23", + "time 0.3.27", "yasna", ] @@ -2800,7 +2795,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2809,7 +2804,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2825,9 +2820,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -2837,9 +2832,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -2854,9 +2849,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "async-compression", "base64 0.21.2", @@ -2879,21 +2874,21 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.6", "rustls-pemfile 1.0.3", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] @@ -2914,9 +2909,9 @@ dependencies = [ [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" dependencies = [ "byteorder", "num-traits", @@ -2925,9 +2920,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ "byteorder", "rmp", @@ -2946,6 +2941,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -2972,13 +2973,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -2996,6 +2996,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -3026,17 +3038,27 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe-transmute" @@ -3064,9 +3086,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3080,11 +3102,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3093,9 +3115,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3103,44 +3125,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3266,8 +3288,8 @@ version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63927d22a1e8b74bda98cc6e151fcdf178b7abb0dc6c4f81e0bbf5ffe2fc4ec8" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "shank_macro_impl", "syn 1.0.109", ] @@ -3279,8 +3301,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ce03403df682f80f4dc1efafa87a4d0cb89b03726d0565e6364bdca5b9a441" dependencies = [ "anyhow", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "serde", "syn 1.0.109", ] @@ -3327,9 +3349,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3350,11 +3372,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "solana-account-decoder" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e4e7166dc87b235d087997fd89724d82d0b83f75551fbb1d3d692a47ac237f" +checksum = "714067d617d791bbfc3c4fd30de9e18e7b5f29b5c0853b1a17581a3e88389e71" dependencies = [ "Inflector", "base64 0.13.1", @@ -3377,9 +3409,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8669314c1bab81668baff87db9e81fcf72e15f61d9904e423f13911d8e3949cc" +checksum = "3de77d93db1d7bdf5854c0cad36acb21cf6c44d3119834241e64e6916c92f232" dependencies = [ "bincode", "bytemuck", @@ -3398,9 +3430,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d294b68c3a9f67aedde39c799fed85139d779a332280094054446f5b55a2edad" +checksum = "8a68198e8909cf912aa727e2f9f0b9ed7e6fecd330a8ad99c9e9ebe6d1a9a3ba" dependencies = [ "chrono", "clap 2.34.0", @@ -3416,9 +3448,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073a01cadf661c50373549add14d21436dcfed0fbc88022817481c6a18340fc8" +checksum = "c0b74868956b9fb8d13fdc7710e4a7e7fec321e8698e777cc7c063686c7b14e0" dependencies = [ "dirs-next", "lazy_static", @@ -3432,9 +3464,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3c55fbbc68dbf7b2df2ba01038d6d2a65522deec3db9c7b15e9c8c1d9dc526" +checksum = "e076aa655a745d4d9455e61280568aa86f403022747c680ce54dcd1ce0f3cb95" dependencies = [ "async-mutex", "async-trait", @@ -3459,7 +3491,7 @@ dependencies = [ "rand_chacha 0.2.2", "rayon", "reqwest", - "rustls", + "rustls 0.20.8", "semver", "serde", "serde_derive", @@ -3486,9 +3518,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6faa5fbf80687e39850c3139561b38d35f9d35e248adaccc4b6379ee41846638" +checksum = "dbfadb7f09be905a08ed50090436c2e6e4bab17a84b8a4e03a94d79e5ce1693e" dependencies = [ "bincode", "chrono", @@ -3500,9 +3532,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3084d18786564211573d5043550ea2750c049eaf3c75ae35ed8e9e845a0dda" +checksum = "7d9e45fb47f142f4ce69acffa4c942d64d96c6d43b24785813d1bdbb90d62833" dependencies = [ "bincode", "byteorder", @@ -3524,9 +3556,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a100b7fa8198c20354eb7256c0d9789107d8a62280221f3efe15f7c9dc4cec" +checksum = "63117658963482734ad016e6b94d2d74599ad0f591ca63d5e0f831e233a85cdb" dependencies = [ "ahash", "blake3", @@ -3558,21 +3590,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f527f44601b35dd67d11bc72f2f7512976a466f9304ef574b87dac83ced8a42" +checksum = "c9eca469f181dcc35c81fb9e0c31c37d0d9abd13805e7cd82446b843a0232246" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "rustc_version", "syn 1.0.109", ] [[package]] name = "solana-logger" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632c8bc480bb5615b70a18b807ede73024aebc7761503ff86a70b7f4906ae47" +checksum = "6e6356aa0978dcdac6404fca123fbfa4c3a329e609fa9921d0e2d8c8cdd921cb" dependencies = [ "env_logger", "lazy_static", @@ -3581,9 +3613,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3d09e890127454f43ffc37a6e23a375fe86c5159c4e5d4767d446ddb7e93a3" +checksum = "4f84a46c881fc5ea3b955d1f2313ffa477aab3ec501782a1387319d2e2376d97" dependencies = [ "log", "solana-sdk", @@ -3591,9 +3623,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185128a041b4c1eaeec7f2034673ce89f99ee364fcb4405313edb1bc26ac95dd" +checksum = "39d25eb6904dd33790f4fe47e48171677fd5402a2df2d82aee5453679ea46774" dependencies = [ "crossbeam-channel", "gethostname", @@ -3605,9 +3637,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16497e2cc753a0a35fb34c73846495fa21ba04a4e64cb92d818c4cb31c935fcc" +checksum = "ec98e671c2dbf742a698674e1f5e34121c2b9c0af661a261413b55bdab62aebc" dependencies = [ "bincode", "clap 3.2.25", @@ -3617,7 +3649,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2", + "socket2 0.4.9", "solana-logger", "solana-sdk", "solana-version", @@ -3627,9 +3659,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc65488c030174215a0176e44f889aed937c172ea1886c878f25ad7ce63f189" +checksum = "c44da6dab9e9669c28a2ce6b700c4da97d4243f108cf222ee2cfebd6ea41fce5" dependencies = [ "ahash", "bincode", @@ -3654,13 +3686,13 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ad5f48743ce505f6139a07e20aecdc689def12da7230fed661c2073ab97df8" +checksum = "8481b0678be8450c423686483319076b2babf11f08cbc48aa6fae9f5cf1232ca" dependencies = [ "base64 0.13.1", "bincode", - "bitflags", + "bitflags 1.3.2", "blake3", "borsh", "borsh-derive", @@ -3681,7 +3713,7 @@ dependencies = [ "memoffset 0.6.5", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "rand 0.7.3", "rand_chacha 0.2.2", "rustc_version", @@ -3703,9 +3735,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e837e539fee15e553bfc6e041bcfbc1113db6e437c21f0319536c4ea1621b884" +checksum = "f0b59b03f3fc3f27f9bac7e2d79923b9b9cde9a77bf9272724fc75f6a78af757" dependencies = [ "base64 0.13.1", "bincode", @@ -3730,9 +3762,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7a1bc3d3e611952e10c9447094f5c2816b5bb8122c6710a6f28395595a671" +checksum = "1f38eab4498e4f2764fb9a833383f35cf39a6f27249aa00b6b2759c6bc61d750" dependencies = [ "lazy_static", "num_cpus", @@ -3740,16 +3772,16 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e4fb5902f71b3965b75a6418874f1d2bff525e4e49108e5f2ea174a5213b66" +checksum = "bd7466a3cf31c68fc38319aab88704162cefd80a5449a05486b5d7713376b620" dependencies = [ "console", "dialoguer", "log", "num-derive", "num-traits", - "parking_lot 0.12.1", + "parking_lot", "qstring", "semver", "solana-sdk", @@ -3759,14 +3791,14 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c515a5a5a5cdc115044c33959eb4d091680f5e7ca8be9eb5218fb0c21bf3568" +checksum = "e67eb3cfd29f62d776fa248d57b730da8d927fa83c81b50cc6683b3f80c87429" dependencies = [ "assert_matches", "base64 0.13.1", "bincode", - "bitflags", + "bitflags 1.3.2", "borsh", "bs58 0.4.0", "bytemuck", @@ -3810,22 +3842,22 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbc3ab3070c090e1a18fd5a0a07d729d0db2bc8524414dc3e16504286d38049" +checksum = "a9a86d529a78915940dcbdfd46d07fa7d64ac0e57a2688d7201fff5a55318653" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "rustversion", "syn 1.0.109", ] [[package]] name = "solana-streamer" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54279b5018a6e9a98e4b4e5dad87953e64359a6f9ce3715ffcdee0691885b88" +checksum = "2959ab13acac7866b2c6b18cfb69d9d854671ae366cc09125767922f39dd81ad" dependencies = [ "crossbeam-channel", "futures-util", @@ -3841,7 +3873,7 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "rustls", + "rustls 0.20.8", "solana-metrics", "solana-perf", "solana-sdk", @@ -3852,9 +3884,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6fbba26070920a1d25be8b3a2835df337ddcb5df1e65e4bbed48a019604377" +checksum = "4e8031a9c3bdc2488bdd8223d0dcc879960310be8b25f1296308cf2b4d9e02d0" dependencies = [ "Inflector", "base64 0.13.1", @@ -3881,9 +3913,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122eccec6f9124b9234fde0ba6da263198f8e403f58e6535cd342f5fd3bd6c76" +checksum = "9252ad2a1ff40cf7b09285af6b6f5922267b04eab8cae0290f8caf29c281b12e" dependencies = [ "log", "rustc_version", @@ -3897,9 +3929,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edcb5a3ff3a8e78441badd1f21d2d6244e33497ee341b1bcafea768c6b501e6" +checksum = "61bb156d6953023d59b2473d18cdb135b4b26eef94e669a9ee3d412edeb6d1f8" dependencies = [ "bincode", "log", @@ -3918,9 +3950,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.20" +version = "1.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d51d131cdefcb621a8034321ce487c4f788e813f81ce81e4f65eed8d4b4f2aa" +checksum = "c2853efabded5dce340cb67dc1f28f6db75dac219d9d9142d81073e2c43c9b7a" dependencies = [ "aes-gcm-siv", "arrayref", @@ -4062,19 +4094,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.25" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "unicode-ident", ] @@ -4084,17 +4116,17 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2 1.0.66", + "quote 1.0.33", "syn 1.0.109", "unicode-xid 0.2.4", ] [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -4103,11 +4135,10 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", @@ -4141,22 +4172,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -4172,10 +4203,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -4190,9 +4222,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -4233,33 +4265,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.14.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", - "parking_lot 0.11.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", + "socket2 0.5.3", "tokio-macros", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -4278,16 +4309,26 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.6", + "tokio", +] + [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -4302,19 +4343,19 @@ checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.20.8", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tungstenite", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] name = "tokio-util" -version = "0.7.2" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4341,9 +4382,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.13" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8751d9c1b03c6500c387e96f81f815a4f8e72d142d2d4a9ffa6fedd51ddee7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "toml_datetime", @@ -4374,9 +4415,9 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] @@ -4407,13 +4448,13 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.20.8", "sha-1", "thiserror", "url", "utf-8", "webpki", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -4424,9 +4465,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -4439,9 +4480,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4602,9 +4643,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4626,7 +4667,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.29", + "quote 1.0.33", "wasm-bindgen-macro-support", ] @@ -4636,9 +4677,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4678,6 +4719,12 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "winapi" version = "0.3.9" @@ -4715,7 +4762,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4733,7 +4780,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4753,17 +4800,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -4774,9 +4821,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4786,9 +4833,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4798,9 +4845,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4810,9 +4857,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4822,9 +4869,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4834,9 +4881,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4846,26 +4893,27 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -4893,14 +4941,14 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.23", + "time 0.3.27", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -4926,7 +4974,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.23", + "time 0.3.27", ] [[package]] @@ -4944,9 +4992,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", ] [[package]] From 1c6902c78c86356d9df676a8c4f5e20832e2d4ba Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Thu, 24 Aug 2023 14:18:10 -0500 Subject: [PATCH 32/45] Added step 4 --- publish.bash | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/publish.bash b/publish.bash index 13ef6431f6..8fc51d9fe9 100755 --- a/publish.bash +++ b/publish.bash @@ -2,7 +2,7 @@ set -e -steps=(step0 step1 step2 step3) +steps=(step0 step1 step2 step3 step4) step0=(anchor-syn) step1=( anchor-attribute-access-control @@ -15,10 +15,14 @@ step1=( anchor-attribute-state anchor-derive-accounts ) -step2=(anchor-lang) +step2=( + anchor-lang +) step3=( anchor-spl anchor-client +) +step4=( anchor-cli ) From 22b8ec739839998b5dd29ebdfc11f07263d14220 Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:12:26 -0500 Subject: [PATCH 33/45] Backport #2771 (ws endpoint override) and bump cli to 0.25.20 (#20) * backport https://github.com/coral-xyz/anchor/pull/2271 * bump cli version --- cli/src/config.rs | 73 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/cli/src/config.rs b/cli/src/config.rs index 30e899b46b..4af74cd7ec 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -4,19 +4,22 @@ use anchor_syn::idl::Idl; use anyhow::{anyhow, Context, Error, Result}; use clap::{ArgEnum, Parser}; use heck::SnakeCase; -use serde::{Deserialize, Serialize}; +use reqwest::Url; +use serde::de::{self, MapAccess, Visitor}; +use serde::{Deserialize, Deserializer, Serialize}; use solana_cli_config::{Config as SolanaConfig, CONFIG_FILE}; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, Signer}; use std::collections::{BTreeMap, HashMap}; use std::convert::TryFrom; use std::fs::{self, File}; -use std::io; use std::io::prelude::*; +use std::marker::PhantomData; use std::ops::Deref; use std::path::Path; use std::path::PathBuf; use std::str::FromStr; +use std::{fmt, io}; use walkdir::WalkDir; pub trait Merge: Sized { @@ -418,10 +421,58 @@ struct _Config { #[derive(Debug, Serialize, Deserialize)] struct Provider { - cluster: String, + #[serde(deserialize_with = "des_cluster")] + cluster: Cluster, wallet: String, } +fn des_cluster<'de, D>(deserializer: D) -> Result +where + D: Deserializer<'de>, +{ + struct StringOrCustomCluster(PhantomData Cluster>); + + impl<'de> Visitor<'de> for StringOrCustomCluster { + type Value = Cluster; + + fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + formatter.write_str("string or map") + } + + fn visit_str(self, value: &str) -> Result + where + E: de::Error, + { + value.parse().map_err(de::Error::custom) + } + + fn visit_map(self, mut map: M) -> Result + where + M: MapAccess<'de>, + { + // Gets keys + if let (Some((http_key, http_value)), Some((ws_key, ws_value))) = ( + map.next_entry::()?, + map.next_entry::()?, + ) { + // Checks keys + if http_key != "http" || ws_key != "ws" { + return Err(de::Error::custom("Invalid key")); + } + + // Checks urls + Url::parse(&http_value).map_err(de::Error::custom)?; + Url::parse(&ws_value).map_err(de::Error::custom)?; + + Ok(Cluster::Custom(http_value, ws_value)) + } else { + Err(de::Error::custom("Invalid entry")) + } + } + } + deserializer.deserialize_any(StringOrCustomCluster(PhantomData)) +} + impl ToString for Config { fn to_string(&self) -> String { let programs = { @@ -438,7 +489,7 @@ impl ToString for Config { features: Some(self.features.clone()), registry: Some(self.registry.clone()), provider: Provider { - cluster: format!("{}", self.provider.cluster), + cluster: self.provider.cluster.clone(), wallet: self.provider.wallet.to_string(), }, test: self.test_validator.clone().map(Into::into), @@ -467,7 +518,7 @@ impl FromStr for Config { features: cfg.features.unwrap_or_default(), registry: cfg.registry.unwrap_or_default(), provider: ProviderConfig { - cluster: cfg.provider.cluster.parse()?, + cluster: cfg.provider.cluster, wallet: shellexpand::tilde(&cfg.provider.wallet).parse()?, }, scripts: cfg.scripts.unwrap_or_default(), @@ -1127,6 +1178,18 @@ mod tests { wallet = \"id.json\" "; + const CUSTOM_CONFIG: &str = " + [provider] + cluster = { http = \"http://my-url.com\", ws = \"ws://my-url.com\" } + wallet = \"id.json\" + "; + + #[test] + fn parse_custom_cluster() { + let config = Config::from_str(CUSTOM_CONFIG).unwrap(); + assert!(!config.features.skip_lint); + } + #[test] fn parse_skip_lint_no_section() { let config = Config::from_str(BASE_CONFIG).unwrap(); From b6554e03f632e218ccb13953173f0cc85c309e1c Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:13:19 -0500 Subject: [PATCH 34/45] split off anchor-cli into its own step in publish script (#19) Co-authored-by: Brett Etter --- publish.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish.bash b/publish.bash index 8fc51d9fe9..776a40dffb 100755 --- a/publish.bash +++ b/publish.bash @@ -30,7 +30,7 @@ for stepName in "${steps[@]}"; do declare -n step="$stepName" pids=() for prog in "${step[@]}"; do - cargo publish -p "$prog" & + cargo publish --registry star-atlas -p "$prog" & pids+=($!) done for pid in "${pids[@]}"; do From acea9f7f043734816a734e75669b31ae11e77e8e Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 25 Aug 2023 12:16:32 -0500 Subject: [PATCH 35/45] Fixed 1.16 read-only account stuff --- lang/src/accounts/account_loader.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lang/src/accounts/account_loader.rs b/lang/src/accounts/account_loader.rs index 6382593eca..e9be46f955 100644 --- a/lang/src/accounts/account_loader.rs +++ b/lang/src/accounts/account_loader.rs @@ -10,6 +10,7 @@ use anchor_lang::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use arrayref::array_ref; use solana_program::account_info::AccountInfo; use solana_program::instruction::AccountMeta; +use solana_program::msg; use solana_program::pubkey::Pubkey; use std::cell::{Ref, RefMut}; use std::collections::{BTreeMap, BTreeSet}; @@ -236,12 +237,15 @@ impl<'info, T: ZeroCopy + Owner> Accounts<'info> for AccountLoader<'info, T> { impl<'info, T: ZeroCopy + Owner> AccountsExit<'info> for AccountLoader<'info, T> { // The account *cannot* be loaded when this is called. - fn exit(&self, _program_id: &Pubkey) -> Result<()> { - let mut data = self.acc_info.try_borrow_mut_data()?; - let dst: &mut [u8] = &mut data; - if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { - let mut writer = BpfWriter::new(dst); - writer.write_all(&T::discriminator()).unwrap(); + fn exit(&self, program_id: &Pubkey) -> Result<()> { + msg!("AccountLoader::exit"); + if program_id == &T::owner() { + let mut data = self.acc_info.try_borrow_mut_data()?; + let dst: &mut [u8] = &mut data; + if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let mut writer = BpfWriter::new(dst); + writer.write_all(&T::discriminator()).unwrap(); + } } Ok(()) } From ca8caeb16d2cc580d9b2750b0cfc088964fd13f9 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 25 Aug 2023 12:18:20 -0500 Subject: [PATCH 36/45] Revert "Fixed 1.16 read-only account stuff" This reverts commit acea9f7f043734816a734e75669b31ae11e77e8e. --- lang/src/accounts/account_loader.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lang/src/accounts/account_loader.rs b/lang/src/accounts/account_loader.rs index e9be46f955..6382593eca 100644 --- a/lang/src/accounts/account_loader.rs +++ b/lang/src/accounts/account_loader.rs @@ -10,7 +10,6 @@ use anchor_lang::__private::CLOSED_ACCOUNT_DISCRIMINATOR; use arrayref::array_ref; use solana_program::account_info::AccountInfo; use solana_program::instruction::AccountMeta; -use solana_program::msg; use solana_program::pubkey::Pubkey; use std::cell::{Ref, RefMut}; use std::collections::{BTreeMap, BTreeSet}; @@ -237,15 +236,12 @@ impl<'info, T: ZeroCopy + Owner> Accounts<'info> for AccountLoader<'info, T> { impl<'info, T: ZeroCopy + Owner> AccountsExit<'info> for AccountLoader<'info, T> { // The account *cannot* be loaded when this is called. - fn exit(&self, program_id: &Pubkey) -> Result<()> { - msg!("AccountLoader::exit"); - if program_id == &T::owner() { - let mut data = self.acc_info.try_borrow_mut_data()?; - let dst: &mut [u8] = &mut data; - if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { - let mut writer = BpfWriter::new(dst); - writer.write_all(&T::discriminator()).unwrap(); - } + fn exit(&self, _program_id: &Pubkey) -> Result<()> { + let mut data = self.acc_info.try_borrow_mut_data()?; + let dst: &mut [u8] = &mut data; + if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let mut writer = BpfWriter::new(dst); + writer.write_all(&T::discriminator()).unwrap(); } Ok(()) } From ee73671f79a666a512e9a240ee7b803202142574 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Fri, 25 Aug 2023 12:58:05 -0500 Subject: [PATCH 37/45] Anchor fix (#21) * Removed extra message * Bumped version --- Cargo.lock | 28 ++++++++++++------------ cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- lang/Cargo.toml | 20 ++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/src/accounts/account_loader.rs | 14 +++++++----- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 16 files changed, 59 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a425d8b7f3..f569dca50a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -118,7 +118,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -184,7 +184,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -195,7 +195,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-client", "anchor-lang", @@ -229,7 +229,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-lang", "anyhow", @@ -244,7 +244,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-syn", "anyhow", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.20" +version = "0.25.21" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 3001ef3b14..21feb7141a 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.20" +version = "0.25.21" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.20", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.20", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.21", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 43556d14ce..6df87a3a9b 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index a3a0c44534..34c2956b66 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.20", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.20", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.20", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.21", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.21", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index b2bb236762..594cbaca73 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index ba30dddac9..cafa7748e5 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 75d624c32b..fdeb06f3f1 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 7abb35dd41..4e8c708adc 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 095810de13..469265022d 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 7cb559025e..5e0c34ca47 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 60db12f9b6..45e84785c2 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 9100d6819c..2a6cf9c3ba 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index af2a73a647..898e84c7ae 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.20", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/src/accounts/account_loader.rs b/lang/src/accounts/account_loader.rs index 6382593eca..bf7a31d39b 100644 --- a/lang/src/accounts/account_loader.rs +++ b/lang/src/accounts/account_loader.rs @@ -236,12 +236,14 @@ impl<'info, T: ZeroCopy + Owner> Accounts<'info> for AccountLoader<'info, T> { impl<'info, T: ZeroCopy + Owner> AccountsExit<'info> for AccountLoader<'info, T> { // The account *cannot* be loaded when this is called. - fn exit(&self, _program_id: &Pubkey) -> Result<()> { - let mut data = self.acc_info.try_borrow_mut_data()?; - let dst: &mut [u8] = &mut data; - if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { - let mut writer = BpfWriter::new(dst); - writer.write_all(&T::discriminator()).unwrap(); + fn exit(&self, program_id: &Pubkey) -> Result<()> { + if program_id == &T::owner() { + let mut data = self.acc_info.try_borrow_mut_data()?; + let dst: &mut [u8] = &mut data; + if dst[..8] != CLOSED_ACCOUNT_DISCRIMINATOR { + let mut writer = BpfWriter::new(dst); + writer.write_all(&T::discriminator()).unwrap(); + } } Ok(()) } diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index ec382b6ec3..91fd4dba05 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 6a0befce1c..a4fd8d0a02 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.20" +version = "0.25.21" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.20", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = ">=1.10.29,<1.17" From 1c3bac4d5f34d06500de6302e52fe172ec34ec07 Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:44:36 -0400 Subject: [PATCH 38/45] fix empty context structs (#23) --- .../src/codegen/accounts/__cpi_client_accounts.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs b/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs index b70a3a0842..9936e2597a 100644 --- a/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs +++ b/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs @@ -149,11 +149,13 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { }) .collect() }; - let generics = if account_struct_fields.is_empty() { - quote! {} + + let phantom_data = if account_struct_fields.is_empty() { + quote! { phantom: std::marker::PhantomData<&'info ()> } } else { - quote! {<'info>} + quote! {} }; + let struct_doc = proc_macro2::TokenStream::from_str(&format!( "#[doc = \" Generated CPI struct of the accounts for [`{}`].\"]", name @@ -173,12 +175,13 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { #(#re_exports)* #struct_doc - pub struct #name #generics { + pub struct #name<'info> { #(#account_struct_fields),* + #phantom_data } #[automatically_derived] - impl #generics anchor_lang::ToAccountMetas for #name #generics { + impl<'info> anchor_lang::ToAccountMetas for #name<'info>{ fn to_account_metas(&self, is_signer: Option) -> Vec { let mut account_metas = vec![]; #(#account_struct_metas)* @@ -187,7 +190,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { } #[automatically_derived] - impl<'info> anchor_lang::ToAccountInfos<'info> for #name #generics { + impl<'info> anchor_lang::ToAccountInfos<'info> for #name<'info> { fn to_account_infos(&self) -> Vec> { let mut account_infos = vec![]; #(#account_struct_infos)* From 56314aaf09709323b433d456e399055cc0f36219 Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:08:36 -0400 Subject: [PATCH 39/45] bump versions (#24) --- Cargo.lock | 28 ++++++++++++------------ cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- lang/Cargo.toml | 20 ++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f569dca50a..313e13fc15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -118,7 +118,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -184,7 +184,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -195,7 +195,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-client", "anchor-lang", @@ -229,7 +229,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-lang", "anyhow", @@ -244,7 +244,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-syn", "anyhow", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.21" +version = "0.25.22" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 21feb7141a..c4b79143ae 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.21" +version = "0.25.22" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.21", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.21", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.22", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 6df87a3a9b..827e9513b1 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 34c2956b66..c7d93d0cfd 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.21", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.21", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.21", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.22", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.22", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 594cbaca73..c65d8b8055 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index cafa7748e5..990d83bfda 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index fdeb06f3f1..47a7543d4e 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 4e8c708adc..1b7debb7f2 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 469265022d..8a1f363e48 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 5e0c34ca47..f254630611 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 45e84785c2..3c9eae7418 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 2a6cf9c3ba..59a3da5ffc 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index 898e84c7ae..d5bc7fe6eb 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.21", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 91fd4dba05..785bdcbdb0 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index a4fd8d0a02..c24ad36ed3 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.21" +version = "0.25.22" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.21", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = ">=1.10.29,<1.17" From 2ad9871b94810175ff0dc0e72a5c19864c0adb61 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Tue, 28 Nov 2023 16:08:55 -0600 Subject: [PATCH 40/45] Added context remaining ix data --- lang/src/context.rs | 19 ++++++++++ lang/syn/src/codegen/program/handlers.rs | 44 ++++++++++++++++-------- 2 files changed, 48 insertions(+), 15 deletions(-) diff --git a/lang/src/context.rs b/lang/src/context.rs index f007bc5102..5f75434249 100644 --- a/lang/src/context.rs +++ b/lang/src/context.rs @@ -34,6 +34,7 @@ pub struct Context<'a, 'b, 'c, 'info, T> { /// convenience so that handlers don't have to recalculate bump seeds or /// pass them in as arguments. pub bumps: BTreeMap, + pub remaining_ix_data: &'a [u8], } impl<'a, 'b, 'c, 'info, T: fmt::Debug> fmt::Debug for Context<'a, 'b, 'c, 'info, T> { @@ -48,6 +49,7 @@ impl<'a, 'b, 'c, 'info, T: fmt::Debug> fmt::Debug for Context<'a, 'b, 'c, 'info, } impl<'a, 'b, 'c, 'info, T: Accounts<'info>> Context<'a, 'b, 'c, 'info, T> { + #[deprecated(note = "Use `new_with_ix_data` instead")] pub fn new( program_id: &'a Pubkey, accounts: &'b mut T, @@ -59,6 +61,23 @@ impl<'a, 'b, 'c, 'info, T: Accounts<'info>> Context<'a, 'b, 'c, 'info, T> { accounts, remaining_accounts, bumps, + remaining_ix_data: &[], + } + } + + pub fn new_with_ix_data( + program_id: &'a Pubkey, + accounts: &'b mut T, + remaining_accounts: &'c [AccountInfo<'info>], + bumps: BTreeMap, + remaining_ix_data: &'a [u8], + ) -> Self { + Self { + program_id, + accounts, + remaining_accounts, + bumps, + remaining_ix_data, } } } diff --git a/lang/syn/src/codegen/program/handlers.rs b/lang/syn/src/codegen/program/handlers.rs index 5dd62b0587..b8e7c875e3 100644 --- a/lang/syn/src/codegen/program/handlers.rs +++ b/lang/syn/src/codegen/program/handlers.rs @@ -306,8 +306,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction data. - let ix = instruction::state::#ix_name::deserialize(&mut &ix_data[..]) + let ix = instruction::state::#ix_name::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let instruction::state::#variant_arm = ix; @@ -360,11 +361,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { { let mut instance = loader.load_init()?; instance.new( - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut ctor_user_def_accounts, remaining_accounts, __bumps, + ix_data_vals, ), #(#ctor_untyped_args),* )?; @@ -386,8 +388,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction data. - let ix = instruction::state::#ix_name::deserialize(&mut &ix_data[..]) + let ix = instruction::state::#ix_name::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let instruction::state::#variant_arm = ix; @@ -403,11 +406,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { // Invoke the ctor. let instance = #mod_name::#name::new( - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut ctor_user_def_accounts, remaining_accounts, __bumps, + ix_data_vals, ), #(#ctor_untyped_args),* )?; @@ -495,8 +499,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction. - let ix = instruction::state::#ix_name::deserialize(&mut &ix_data[..]) + let ix = instruction::state::#ix_name::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let instruction::state::#variant_arm = ix; @@ -522,11 +527,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { &mut __reallocs, )?; let ctx = - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut accounts, remaining_accounts, __bumps, + ix_data_vals, ); // Execute user defined function. @@ -555,8 +561,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction. - let ix = instruction::state::#ix_name::deserialize(&mut &ix_data[..]) + let ix = instruction::state::#ix_name::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let instruction::state::#variant_arm = ix; @@ -588,11 +595,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { &mut __reallocs, )?; let ctx = - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut accounts, remaining_accounts, - __bumps + __bumps, + ix_data_vals, ); // Execute user defined function. @@ -672,7 +680,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { let deserialize_instruction = quote! { #args_struct - let ix = Args::deserialize(&mut &ix_data[..]) + let ix = Args::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let Args { #(#ix_arg_names),* @@ -690,6 +698,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction. #deserialize_instruction @@ -721,11 +730,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { &mut __reallocs, )?; let ctx = - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut accounts, remaining_accounts, __bumps, + ix_data_vals, ); // Execute user defined function. @@ -757,6 +767,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize instruction. #deserialize_instruction @@ -777,11 +788,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { // Execute user defined function. #state_name::#ix_method_name( - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut accounts, remaining_accounts, - __bumps + __bumps, + ix_data_vals, ), #(#ix_arg_names),* )?; @@ -826,8 +838,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { #[cfg(not(feature = "no-log-ix-name"))] anchor_lang::prelude::msg!(#ix_name_log); + let mut ix_data_vals = ix_data; // Deserialize data. - let ix = instruction::#ix_name::deserialize(&mut &ix_data[..]) + let ix = instruction::#ix_name::deserialize(&mut ix_data_vals) .map_err(|_| anchor_lang::error::ErrorCode::InstructionDidNotDeserialize)?; let instruction::#variant_arm = ix; @@ -848,11 +861,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { // Invoke user defined handler. let result = #program_name::#ix_method_name( - anchor_lang::context::Context::new( + anchor_lang::context::Context::new_with_ix_data( program_id, &mut accounts, remaining_accounts, __bumps, + ix_data_vals, ), #(#ix_arg_names),* )?; From 8135f953e02cc6681effaaa88b135814d1df93db Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Tue, 28 Nov 2023 16:24:49 -0600 Subject: [PATCH 41/45] Bumped version --- Cargo.lock | 28 ++++++++++++------------ cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- lang/Cargo.toml | 20 ++++++++--------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 313e13fc15..a9d576ff3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -118,7 +118,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -140,7 +140,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "proc-macro2 1.0.66", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -161,7 +161,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -184,7 +184,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -195,7 +195,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-client", "anchor-lang", @@ -229,7 +229,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-lang", "anyhow", @@ -244,7 +244,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -277,7 +277,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -289,7 +289,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.22" +version = "0.25.23" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c4b79143ae..af030dd2c6 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.22" +version = "0.25.23" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.22", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.22", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.23", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.10.3" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 827e9513b1..54fea85279 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index c7d93d0cfd..0acaed642f 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.22", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.22", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.22", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.23", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.23", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index c65d8b8055..7b0c46e303 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 990d83bfda..90d2b8689b 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 47a7543d4e..82201bd66b 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index 1b7debb7f2..cab2ddf7c0 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index 8a1f363e48..e393ac4ca1 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index f254630611..9739e65282 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 3c9eae7418..86d2ee2d19 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index 59a3da5ffc..f986affdc1 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index d5bc7fe6eb..c15568a15a 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.22", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 785bdcbdb0..9db6388629 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index c24ad36ed3..0ad1c06f11 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.22" +version = "0.25.23" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.22", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = ">=1.10.29,<1.17" From 1d261ae262b9187d09bc895313be125079953e04 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Tue, 16 Jan 2024 13:29:39 -0600 Subject: [PATCH 42/45] Fixed anchor for 0.17 --- Cargo.lock | 2421 +++++++++++++++++++++++++------------ cli/Cargo.toml | 12 +- cli/src/config.rs | 6 +- client/Cargo.toml | 6 +- client/example/Cargo.toml | 2 +- lang/Cargo.toml | 3 +- spl/Cargo.toml | 2 +- 7 files changed, 1679 insertions(+), 773 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a9d576ff3b..072c0ceb09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] @@ -56,7 +56,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "polyval", "subtle", @@ -65,20 +65,33 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom 0.2.12", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ - "getrandom 0.2.10", + "cfg-if", + "getrandom 0.2.12", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -110,8 +123,8 @@ version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "regex", "syn 1.0.109", ] @@ -123,8 +136,8 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "rustversion", "syn 1.0.109", ] @@ -134,7 +147,7 @@ name = "anchor-attribute-constant" version = "0.25.23" dependencies = [ "anchor-syn", - "proc-macro2 1.0.66", + "proc-macro2 1.0.76", "syn 1.0.109", ] @@ -143,8 +156,8 @@ name = "anchor-attribute-error" version = "0.25.23" dependencies = [ "anchor-syn", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -154,8 +167,8 @@ version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -166,8 +179,8 @@ dependencies = [ "anchor-syn", "anyhow", "heck 0.3.3", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -177,8 +190,8 @@ version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -188,8 +201,8 @@ version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -223,7 +236,7 @@ dependencies = [ "syn 1.0.109", "tar", "tokio", - "toml", + "toml 0.5.11", "walkdir", ] @@ -248,8 +261,8 @@ version = "0.25.23" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -257,6 +270,7 @@ dependencies = [ name = "anchor-lang" version = "0.25.23" dependencies = [ + "ahash 0.8.6", "anchor-attribute-access-control", "anchor-attribute-account", "anchor-attribute-constant", @@ -269,7 +283,7 @@ dependencies = [ "arrayref", "base64 0.13.1", "bincode", - "borsh", + "borsh 0.9.3", "bytemuck", "solana-program", "thiserror", @@ -283,8 +297,8 @@ dependencies = [ "mpl-token-metadata", "serum_dex", "solana-program", - "spl-associated-token-account", - "spl-token", + "spl-associated-token-account 1.1.3", + "spl-token 3.5.0", ] [[package]] @@ -294,9 +308,9 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.66", + "proc-macro2 1.0.76", "proc-macro2-diagnostics", - "quote 1.0.33", + "quote 1.0.35", "serde", "serde_json", "sha2 0.9.9", @@ -330,9 +344,132 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "ark-bn254" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint 0.4.4", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint 0.4.4", + "num-traits", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint 0.4.4", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "array-bytes" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" [[package]] name = "arrayref" @@ -346,6 +483,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + [[package]] name = "asn1-rs" version = "0.5.2" @@ -359,7 +502,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] @@ -368,8 +511,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", "synstructure", ] @@ -380,8 +523,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -391,11 +534,22 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "flate2", @@ -416,13 +570,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -471,9 +625,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -498,9 +652,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitmaps" @@ -513,9 +667,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", @@ -556,20 +710,43 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ - "borsh-derive", + "borsh-derive 0.9.3", "hashbrown 0.11.2", ] +[[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive 0.10.3", + "hashbrown 0.13.2", +] + [[package]] name = "borsh-derive" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.76", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal 0.10.3", + "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.66", + "proc-macro2 1.0.76", "syn 1.0.109", ] @@ -579,8 +756,19 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -590,16 +778,27 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -608,9 +807,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -630,9 +829,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bv" @@ -646,35 +845,35 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "caps" @@ -688,13 +887,12 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.10.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363c7cfaa15f101415c4ac9e68706ca4a2277773932828b33f96e59d28c68e62" +checksum = "802b755090e39835a4b0440fb0bbee0df7495a8b337f63db21e616f7821c7e8c" dependencies = [ "serde", - "serde_derive", - "toml", + "toml 0.8.8", ] [[package]] @@ -715,18 +913,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -738,16 +935,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "2.34.0" @@ -788,8 +975,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -802,17 +989,39 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -843,15 +1052,15 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -859,15 +1068,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -883,46 +1092,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -956,7 +1156,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -973,11 +1173,46 @@ dependencies = [ "zeroize", ] +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.76", + "quote 1.0.35", + "strsim 0.10.0", + "syn 2.0.48", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "der" @@ -1004,9 +1239,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivation-path" @@ -1014,6 +1252,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 1.0.109", +] + [[package]] name = "dialoguer" version = "0.10.4" @@ -1102,9 +1351,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -1168,7 +1417,7 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.7", + "sha2 0.10.8", ] [[package]] @@ -1194,34 +1443,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.8.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" -dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.12" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ - "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -1239,8 +1476,8 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] @@ -1265,23 +1502,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1292,9 +1518,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "feature-probe" @@ -1314,21 +1540,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1357,18 +1583,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1381,9 +1607,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1391,15 +1617,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1408,38 +1634,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1453,15 +1679,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1498,9 +1715,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -1511,36 +1728,56 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] -name = "h2" -version = "0.3.21" +name = "goblin" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ - "bytes", - "fnv", - "futures-core", + "log", + "plain", + "scroll", +] + +[[package]] +name = "h2" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" +dependencies = [ + "bytes", + "fnv", + "futures-core", "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.7", ] [[package]] @@ -1548,15 +1785,21 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.6", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1584,9 +1827,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "histogram" @@ -1626,9 +1869,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1637,9 +1880,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1666,9 +1909,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1681,7 +1924,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -1690,14 +1933,14 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.6", + "rustls 0.21.10", "tokio", "tokio-rustls 0.24.1", ] @@ -1717,16 +1960,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1738,11 +1981,17 @@ dependencies = [ "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1776,40 +2025,41 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] name = "indicatif" -version = "0.16.2" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", - "lazy_static", + "instant", "number_prefix", - "regex", + "portable-atomic", + "unicode-width", ] [[package]] -name = "inout" -version = "0.1.3" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "generic-array", + "cfg-if", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -1831,24 +2081,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1870,9 +2120,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1885,18 +2135,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] -name = "libloading" -version = "0.7.4" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "cfg-if", - "winapi", + "bitflags 2.4.1", + "libc", + "redox_syscall", ] [[package]] @@ -1947,23 +2198,17 @@ dependencies = [ "libsecp256k1-core", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1977,9 +2222,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1992,9 +2237,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] @@ -2053,9 +2298,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2068,10 +2313,10 @@ version = "1.4.3-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81a34d740606a10a9dac7507d0c9025d72e0ce311c68ae85b6634982cf69a9c6" dependencies = [ - "borsh", + "borsh 0.9.3", "bytemuck", "mpl-token-metadata-context-derive 0.2.1", - "num-derive", + "num-derive 0.3.3", "num-traits", "rmp-serde", "serde", @@ -2088,16 +2333,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "654976568c99887549e1291e7b7e55ae31a70732e56ebb25cb1cdfc08c018333" dependencies = [ "arrayref", - "borsh", + "borsh 0.9.3", "mpl-token-auth-rules", "mpl-token-metadata-context-derive 0.3.0", "mpl-utils", - "num-derive", + "num-derive 0.3.3", "num-traits", "shank", "solana-program", - "spl-associated-token-account", - "spl-token", + "spl-associated-token-account 2.2.0", + "spl-token 4.0.0", "thiserror", ] @@ -2107,7 +2352,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12989bc45715b0ee91944855130131479f9c772e198a910c3eb0ea327d5bffc3" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -2117,7 +2362,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5a739019e11d93661a64ef5fe108ab17c79b35961e944442ff6efdd460ad01a" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -2129,7 +2374,7 @@ checksum = "3f2e4f92aec317d5853c0cc4c03c55f5178511c45bb3dbb441aea63117bf3dc9" dependencies = [ "arrayref", "solana-program", - "spl-token-2022", + "spl-token-2022 0.6.1", ] [[package]] @@ -2152,14 +2397,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] @@ -2224,11 +2470,22 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2264,9 +2521,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2277,7 +2534,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -2287,7 +2544,25 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", ] [[package]] @@ -2297,11 +2572,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.0.0", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -2310,9 +2609,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2328,9 +2627,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2340,11 +2639,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -2359,9 +2658,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -2372,9 +2671,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -2384,9 +2683,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" @@ -2400,13 +2699,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2452,9 +2751,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percentage" @@ -2467,9 +2766,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2490,9 +2789,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "plain" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "polyval" @@ -2506,6 +2811,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + [[package]] name = "portpicker" version = "0.1.1" @@ -2515,6 +2826,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2527,7 +2844,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] @@ -2537,7 +2854,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b2685dd208a3771337d8d386a89840f0f43cd68be8dae90a5f8c2384effc9cd" +dependencies = [ + "toml_edit 0.21.0", ] [[package]] @@ -2547,8 +2873,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", "version_check", ] @@ -2559,8 +2885,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "version_check", ] @@ -2575,9 +2901,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -2588,8 +2914,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", "version_check", "yansi", @@ -2606,17 +2932,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.8.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", - "rustls 0.20.8", + "rustc-hash", + "rustls 0.20.9", "thiserror", "tokio", "tracing", @@ -2625,17 +2950,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "fxhash", "rand 0.8.5", - "ring", - "rustls 0.20.8", + "ring 0.16.20", + "rustc-hash", + "rustls 0.20.9", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", @@ -2645,16 +2969,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-util", "libc", "quinn-proto", - "socket2 0.4.9", - "tokio", + "socket2 0.4.10", "tracing", + "windows-sys 0.42.0", ] [[package]] @@ -2668,11 +2991,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2 1.0.76", ] [[package]] @@ -2734,7 +3057,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", ] [[package]] @@ -2757,9 +3080,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -2767,62 +3090,51 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rcgen" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.27", + "ring 0.16.20", + "time", "yasna", ] [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.12", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2832,9 +3144,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2843,18 +3155,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "async-compression", - "base64 0.21.2", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -2874,11 +3186,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", - "rustls-pemfile 1.0.3", + "rustls 0.21.10", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -2888,7 +3201,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", "winreg", ] @@ -2901,12 +3214,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom 0.2.12", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rmp" version = "0.8.12" @@ -2931,14 +3258,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "6.0.1" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", - "serde", - "serde_json", - "winapi", + "rtoolbox", + "windows-sys 0.48.0", +] + +[[package]] +name = "rtoolbox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +dependencies = [ + "libc", + "windows-sys 0.48.0", ] [[package]] @@ -2973,37 +3309,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -3015,37 +3351,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.3", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -3056,9 +3383,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safe-transmute" @@ -3077,11 +3404,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3090,14 +3417,34 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -3125,50 +3472,59 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.186" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.186" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3181,16 +3537,39 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.1.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -3206,11 +3585,11 @@ dependencies = [ "field-offset", "itertools 0.9.0", "num-traits", - "num_enum", + "num_enum 0.5.11", "safe-transmute", "serde", "solana-program", - "spl-token", + "spl-token 3.5.0", "static_assertions", "thiserror", "without-alloc", @@ -3242,9 +3621,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3288,8 +3667,8 @@ version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63927d22a1e8b74bda98cc6e151fcdf178b7abb0dc6c4f81e0bbf5ffe2fc4ec8" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "shank_macro_impl", "syn 1.0.109", ] @@ -3301,8 +3680,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ce03403df682f80f4dc1efafa87a4d0cb89b03726d0565e6364bdca5b9a441" dependencies = [ "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "serde", "syn 1.0.109", ] @@ -3358,15 +3737,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -3374,9 +3753,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3384,12 +3763,12 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714067d617d791bbfc3c4fd30de9e18e7b5f29b5c0853b1a17581a3e88389e71" +checksum = "b5763ba7519b166b152ca2c6f8defa22cd07d3aea42a3a86b74519857fc3d464" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.7", "bincode", "bs58 0.4.0", "bv", @@ -3400,23 +3779,23 @@ dependencies = [ "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", - "solana-vote-program", - "spl-token", - "spl-token-2022", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "spl-token-metadata-interface", "thiserror", "zstd", ] [[package]] name = "solana-address-lookup-table-program" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de77d93db1d7bdf5854c0cad36acb21cf6c44d3119834241e64e6916c92f232" +checksum = "18a216474b9d25153d629aa7f4fb2246bc875ebe90e1155380e0436c209e62d5" dependencies = [ "bincode", "bytemuck", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -3430,9 +3809,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a68198e8909cf912aa727e2f9f0b9ed7e6fecd330a8ad99c9e9ebe6d1a9a3ba" +checksum = "2bef7e2234cf1179b8ceadfae922d38d79f82932a762ff62b0051e0b3205984f" dependencies = [ "chrono", "clap 2.34.0", @@ -3448,9 +3827,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b74868956b9fb8d13fdc7710e4a7e7fec321e8698e777cc7c063686c7b14e0" +checksum = "99cb6252b2728b4e99fa293df02e7a40ef86c9b3fb5863e8b1430e09ec77f1ee" dependencies = [ "dirs-next", "lazy_static", @@ -3464,63 +3843,42 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076aa655a745d4d9455e61280568aa86f403022747c680ce54dcd1ce0f3cb95" +checksum = "2644f5a0c91f8c44db175d35d52bf772799597dbedf6a5d9f138d61e2b52b826" dependencies = [ - "async-mutex", "async-trait", - "base64 0.13.1", "bincode", - "bs58 0.4.0", - "bytes", - "clap 2.34.0", - "crossbeam-channel", - "enum_dispatch", "futures", "futures-util", "indexmap 1.9.3", "indicatif", - "itertools 0.10.5", - "jsonrpc-core", - "lazy_static", "log", "quinn", - "quinn-proto", "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", - "reqwest", - "rustls 0.20.8", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-faucet", + "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", + "solana-pubsub-client", + "solana-quic-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-rpc-client-nonce-utils", "solana-sdk", "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token-2022", + "solana-thin-client", + "solana-tpu-client", + "solana-udp-client", "thiserror", "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", ] [[package]] name = "solana-config-program" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfadb7f09be905a08ed50090436c2e6e4bab17a84b8a4e03a94d79e5ce1693e" +checksum = "3bb9b6d2c575e1eecd85380cb6442525a0d2639afa627552264eaa7050f47fb3" dependencies = [ "bincode", "chrono", @@ -3530,11 +3888,32 @@ dependencies = [ "solana-sdk", ] +[[package]] +name = "solana-connection-cache" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd27f413c3702ee20bbf1152e928f9adff0a37fef0f36b956d4eb34aae2be71" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap 1.9.3", + "log", + "rand 0.7.3", + "rayon", + "rcgen", + "solana-measure", + "solana-metrics", + "solana-sdk", + "thiserror", + "tokio", +] + [[package]] name = "solana-faucet" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9e45fb47f142f4ce69acffa4c942d64d96c6d43b24785813d1bdbb90d62833" +checksum = "9c66685b647a18573f4719b488bf1ba6474ec0f32f3adb439986617faa9aba5a" dependencies = [ "bincode", "byteorder", @@ -3549,20 +3928,20 @@ dependencies = [ "solana-metrics", "solana-sdk", "solana-version", - "spl-memo", + "spl-memo 4.0.0", "thiserror", "tokio", ] [[package]] name = "solana-frozen-abi" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63117658963482734ad016e6b94d2d74599ad0f591ca63d5e0f831e233a85cdb" +checksum = "a7077f6495ccc313dff49c3e3f3ed03e49058258bae7fee77ac29ba0a474ba82" dependencies = [ - "ahash", + "ahash 0.8.6", "blake3", - "block-buffer 0.9.0", + "block-buffer 0.10.4", "bs58 0.4.0", "bv", "byteorder", @@ -3570,7 +3949,6 @@ dependencies = [ "either", "generic-array", "getrandom 0.1.16", - "hashbrown 0.12.3", "im", "lazy_static", "log", @@ -3582,7 +3960,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", "thiserror", @@ -3590,21 +3968,21 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9eca469f181dcc35c81fb9e0c31c37d0d9abd13805e7cd82446b843a0232246" +checksum = "f516f992211a2ab70de5c367190575c97e02d156f9f1d8b76886d673f30e88a2" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "rustc_version", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "solana-logger" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6356aa0978dcdac6404fca123fbfa4c3a329e609fa9921d0e2d8c8cdd921cb" +checksum = "7b64def674bfaa4a3f8be7ba19c03c9caec4ec028ba62b9a427ec1bf608a2486" dependencies = [ "env_logger", "lazy_static", @@ -3613,9 +3991,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f84a46c881fc5ea3b955d1f2313ffa477aab3ec501782a1387319d2e2376d97" +checksum = "932db6604bcf8ba3bba68e80564d7eaa0dd7b9667407e15c3557caa83203aee7" dependencies = [ "log", "solana-sdk", @@ -3623,9 +4001,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d25eb6904dd33790f4fe47e48171677fd5402a2df2d82aee5453679ea46774" +checksum = "5d81931f224798c0e52062b0683a07eebe1c1904954c8765773c9802a28fbd0c" dependencies = [ "crossbeam-channel", "gethostname", @@ -3637,9 +4015,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec98e671c2dbf742a698674e1f5e34121c2b9c0af661a261413b55bdab62aebc" +checksum = "7ea3420fa9da3789548f31b3c68e6a090bfd1320c735289851b711546d38e3b0" dependencies = [ "bincode", "clap 3.2.25", @@ -3649,7 +4027,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_derive", - "socket2 0.4.9", + "socket2 0.4.10", "solana-logger", "solana-sdk", "solana-version", @@ -3659,11 +4037,11 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44da6dab9e9669c28a2ce6b700c4da97d4243f108cf222ee2cfebd6ea41fce5" +checksum = "5859de708bd12fb189f3c161cda03fdd341ffcf6be4fe787c7d730a30d589ac6" dependencies = [ - "ahash", + "ahash 0.8.6", "bincode", "bv", "caps", @@ -3686,16 +4064,21 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8481b0678be8450c423686483319076b2babf11f08cbc48aa6fae9f5cf1232ca" +checksum = "3e92350aa5b42564681655331e7e0b9d5c99a442de317ceeb4741efbbe9a6c05" dependencies = [ - "base64 0.13.1", + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "array-bytes", + "base64 0.21.7", "bincode", "bitflags 1.3.2", "blake3", - "borsh", - "borsh-derive", + "borsh 0.10.3", + "borsh 0.9.3", "bs58 0.4.0", "bv", "bytemuck", @@ -3703,15 +4086,16 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.10", + "getrandom 0.2.12", "itertools 0.10.5", "js-sys", "lazy_static", "libc", "libsecp256k1", "log", - "memoffset 0.6.5", - "num-derive", + "memoffset 0.9.0", + "num-bigint 0.4.4", + "num-derive 0.3.3", "num-traits", "parking_lot", "rand 0.7.3", @@ -3722,7 +4106,7 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3735,20 +4119,20 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b59b03f3fc3f27f9bac7e2d79923b9b9cde9a77bf9272724fc75f6a78af757" +checksum = "3da0e9dd63326ded2055b42e54aa37baa6aeb8adaea658a0059c234af6d05c02" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "bincode", "eager", "enum-iterator", "itertools 0.10.5", "libc", - "libloading", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", + "percentage", "rand 0.7.3", "rustc_version", "serde", @@ -3757,14 +4141,68 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-pubsub-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d1ad6fa8f0e154b91e67969fdf5478e74b75a87d5e3dce14ab83f4cb2f60f1" +dependencies = [ + "crossbeam-channel", + "futures-util", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tungstenite", + "url", +] + +[[package]] +name = "solana-quic-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de9426ee9c0f98522242d6656db18175a022959af0b8ed3f170729e29933cf08" +dependencies = [ + "async-mutex", + "async-trait", + "futures", + "itertools 0.10.5", + "lazy_static", + "log", + "quinn", + "quinn-proto", + "quinn-udp", + "rcgen", + "rustls 0.20.9", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-rpc-client-api", + "solana-sdk", + "solana-streamer", "thiserror", + "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f38eab4498e4f2764fb9a833383f35cf39a6f27249aa00b6b2759c6bc61d750" +checksum = "c3e6c7a43e34d7db0ad158690b331df15b92f6996e3b9b03629591a54fc3e97f" dependencies = [ "lazy_static", "num_cpus", @@ -3772,14 +4210,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7466a3cf31c68fc38319aab88704162cefd80a5449a05486b5d7713376b620" +checksum = "ed87a28ede1536be71352e13965b1fe7a2cf205e3e4fae2eef8a3407219ba1cd" dependencies = [ "console", "dialoguer", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "qstring", @@ -3789,17 +4227,78 @@ dependencies = [ "uriparse", ] +[[package]] +name = "solana-rpc-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f273acbce4493bc1de8174b94cfaee112b72263ae1684a6e13890f5004be53fb" +dependencies = [ + "async-trait", + "base64 0.21.7", + "bincode", + "bs58 0.4.0", + "indicatif", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "solana-vote-program", + "tokio", +] + +[[package]] +name = "solana-rpc-client-api" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4462198830687b83870985db945c5d49c720d83abf516c8206fefba12cca689d" +dependencies = [ + "base64 0.21.7", + "bs58 0.4.0", + "jsonrpc-core", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "spl-token-2022 0.9.0", + "thiserror", +] + +[[package]] +name = "solana-rpc-client-nonce-utils" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b3abad7b1ffd4b29d33b7525ebbc2ec8d0ca5928e4d8f28e364928d68a8dd9" +dependencies = [ + "clap 2.34.0", + "solana-clap-utils", + "solana-rpc-client", + "solana-sdk", + "thiserror", +] + [[package]] name = "solana-sdk" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67eb3cfd29f62d776fa248d57b730da8d927fa83c81b50cc6683b3f80c87429" +checksum = "2087e15c92d4d6b3f085dc12fbe9614141c811f90a54cc418240ac30b608133f" dependencies = [ "assert_matches", - "base64 0.13.1", + "base64 0.21.7", "bincode", "bitflags 1.3.2", - "borsh", + "borsh 0.10.3", "bs58 0.4.0", "bytemuck", "byteorder", @@ -3816,8 +4315,9 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", + "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", "rand 0.7.3", @@ -3828,7 +4328,8 @@ dependencies = [ "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.7", + "serde_with", + "sha2 0.10.8", "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3842,23 +4343,25 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a86d529a78915940dcbdfd46d07fa7d64ac0e57a2688d7201fff5a55318653" +checksum = "2e0e0e7ee984b0f9179a1d4f4e9e67ce675de2324b5a98b61d2bdb61be3c19bb" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "rustversion", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "solana-streamer" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2959ab13acac7866b2c6b18cfb69d9d854671ae366cc09125767922f39dd81ad" +checksum = "a868a782cab696677cd12deacda1862dbeeba903a4a8d8404a4d6bf45e8a556c" dependencies = [ + "async-channel", + "bytes", "crossbeam-channel", "futures-util", "histogram", @@ -3871,9 +4374,11 @@ dependencies = [ "percentage", "pkcs8", "quinn", + "quinn-proto", + "quinn-udp", "rand 0.7.3", "rcgen", - "rustls 0.20.8", + "rustls 0.20.9", "solana-metrics", "solana-perf", "solana-sdk", @@ -3882,16 +4387,56 @@ dependencies = [ "x509-parser", ] +[[package]] +name = "solana-thin-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222f5539a4b01a5374c919e78aca5d4472fa5af6e551bf9f4ddd97ca59374f6d" +dependencies = [ + "bincode", + "log", + "rayon", + "solana-connection-cache", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", +] + +[[package]] +name = "solana-tpu-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c0f954b48dda0a907dbdb54387459c8eb7e9c702f278bf70a2caf3ebc417c88" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap 1.9.3", + "indicatif", + "log", + "rand 0.7.3", + "rayon", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-pubsub-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", +] + [[package]] name = "solana-transaction-status" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8031a9c3bdc2488bdd8223d0dcc879960310be8b25f1296308cf2b4d9e02d0" +checksum = "7992d9605a65967b5e40e6ef8e285a953888e4789f0f5e3fb7339bf018cbb677" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.7", "bincode", - "borsh", + "borsh 0.10.3", "bs58 0.4.0", "lazy_static", "log", @@ -3900,22 +4445,34 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-address-lookup-table-program", - "solana-measure", - "solana-metrics", "solana-sdk", - "solana-vote-program", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", + "spl-associated-token-account 2.2.0", + "spl-memo 4.0.0", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", "thiserror", ] +[[package]] +name = "solana-udp-client" +version = "1.16.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4329dfe364cb276c7137b459e3737a27d6ae180f60d0aa2274d8be86cac3472c" +dependencies = [ + "async-trait", + "solana-connection-cache", + "solana-net-utils", + "solana-sdk", + "solana-streamer", + "thiserror", + "tokio", +] + [[package]] name = "solana-version" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252ad2a1ff40cf7b09285af6b6f5922267b04eab8cae0290f8caf29c281b12e" +checksum = "1931390daf0938c072c167611a263a8b95c13476d7fff7c8eb12789a981685b3" dependencies = [ "log", "rustc_version", @@ -3929,13 +4486,13 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61bb156d6953023d59b2473d18cdb135b4b26eef94e669a9ee3d412edeb6d1f8" +checksum = "25669860e2c5e821a8caa5372589289fbb6ac3084096133fdd1c6af6546536a2" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -3943,6 +4500,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", + "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", @@ -3950,23 +4508,21 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.24" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2853efabded5dce340cb67dc1f28f6db75dac219d9d9142d81073e2c43c9b7a" +checksum = "1457c85ab70a518438b9ac2b0c56037b9f6693060dfb617bbb93c7116e4f0c22" dependencies = [ "aes-gcm-siv", - "arrayref", - "base64 0.13.1", + "base64 0.21.7", "bincode", "bytemuck", "byteorder", - "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools 0.10.5", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", "rand 0.7.3", "serde", @@ -3979,12 +4535,37 @@ dependencies = [ "zeroize", ] +[[package]] +name = "solana_rbpf" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" +dependencies = [ + "byteorder", + "combine", + "goblin", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "scroll", + "thiserror", + "winapi", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.5.4" @@ -4002,12 +4583,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", - "borsh", - "num-derive", + "borsh 0.9.3", + "num-derive 0.3.3", "num-traits", "solana-program", - "spl-token", - "spl-token-2022", + "spl-token 3.5.0", + "spl-token-2022 0.6.1", + "thiserror", +] + +[[package]] +name = "spl-associated-token-account" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +dependencies = [ + "assert_matches", + "borsh 0.10.3", + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "thiserror", +] + +[[package]] +name = "spl-discriminator" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" +dependencies = [ + "quote 1.0.35", + "spl-discriminator-syn", + "syn 2.0.48", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "sha2 0.10.8", + "syn 2.0.48", "thiserror", ] @@ -4020,6 +4652,67 @@ dependencies = [ "solana-program", ] +[[package]] +name = "spl-memo" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" +dependencies = [ + "solana-program", +] + +[[package]] +name = "spl-pod" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +dependencies = [ + "borsh 0.10.3", + "bytemuck", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error", +] + +[[package]] +name = "spl-program-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +dependencies = [ + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-program-error-derive", + "thiserror", +] + +[[package]] +name = "spl-program-error-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "sha2 0.10.8", + "syn 2.0.48", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + [[package]] name = "spl-token" version = "3.5.0" @@ -4028,9 +4721,24 @@ checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", + "num_enum 0.5.11", + "solana-program", + "thiserror", +] + +[[package]] +name = "spl-token" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.3.3", + "num-traits", + "num_enum 0.6.1", "solana-program", "thiserror", ] @@ -4043,16 +4751,81 @@ checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", + "num_enum 0.5.11", "solana-program", "solana-zk-token-sdk", - "spl-memo", - "spl-token", + "spl-memo 3.0.1", + "spl-token 3.5.0", "thiserror", ] +[[package]] +name = "spl-token-2022" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.4.1", + "num-traits", + "num_enum 0.7.2", + "solana-program", + "solana-zk-token-sdk", + "spl-memo 4.0.0", + "spl-pod", + "spl-token 4.0.0", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", + "thiserror", +] + +[[package]] +name = "spl-token-metadata-interface" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +dependencies = [ + "borsh 0.10.3", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", +] + +[[package]] +name = "spl-type-length-value" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -4094,19 +4867,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.29" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "unicode-ident", ] @@ -4116,12 +4889,33 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", + "proc-macro2 1.0.76", + "quote 1.0.35", "syn 1.0.109", "unicode-xid 0.2.4", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tar" version = "0.4.40" @@ -4135,22 +4929,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4172,43 +4966,33 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "time" -version = "0.1.45" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -4216,15 +5000,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -4265,9 +5049,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -4277,20 +5061,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -4309,7 +5093,7 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] @@ -4320,7 +5104,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.10", "tokio", ] @@ -4343,7 +5127,7 @@ checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "tokio-rustls 0.23.4", "tungstenite", @@ -4353,9 +5137,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4374,19 +5158,47 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -4399,11 +5211,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4411,29 +5222,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -4448,7 +5259,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.20.8", + "rustls 0.20.9", "sha-1", "thiserror", "url", @@ -4459,9 +5270,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" @@ -4474,15 +5285,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -4501,9 +5312,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -4527,6 +5338,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" + [[package]] name = "unsize" version = "1.1.0" @@ -4542,6 +5368,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "uriparse" version = "0.6.4" @@ -4554,9 +5386,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4587,11 +5419,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4612,12 +5450,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4626,9 +5458,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4636,24 +5468,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -4663,38 +5495,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4702,12 +5534,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -4721,9 +5553,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "winapi" @@ -4743,9 +5575,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4757,21 +5589,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows-targets 0.42.2", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -4784,18 +5622,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.0", ] [[package]] @@ -4813,6 +5645,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -4825,6 +5672,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -4837,6 +5690,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -4849,6 +5708,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -4861,6 +5726,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -4873,6 +5744,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -4885,6 +5762,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -4897,11 +5780,17 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -4941,25 +5830,18 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.27", + "time", ] [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", + "linux-raw-sys", + "rustix", ] [[package]] @@ -4974,7 +5856,27 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.27", + "time", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -4992,9 +5894,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.33", - "syn 2.0.29", + "proc-macro2 1.0.76", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -5018,11 +5920,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index af030dd2c6..b0fed86282 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -21,7 +21,7 @@ anchor-client = { path = "../client", version = "0.25.23", registry = "star-atla anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" -cargo_toml = "0.10.3" +cargo_toml = "0.18.0" chrono = "0.4.19" clap = { version = "3.0.13", features = ["derive"] } dirs = "3.0" @@ -35,11 +35,11 @@ semver = "1.0.4" serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0" shellexpand = "2.1.0" -solana-cli-config = ">=1.10.29,<1.17" -solana-client = ">=1.10.29,<1.17" -solana-faucet = ">=1.10.29,<1.17" -solana-program = ">=1.10.29,<1.17" -solana-sdk = ">=1.10.29,<1.17" +solana-cli-config = ">=1.10.29,<1.18" +solana-client = ">=1.10.29,<1.18" +solana-faucet = ">=1.10.29,<1.18" +solana-program = ">=1.10.29,<1.18" +solana-sdk = ">=1.10.29,<1.18" syn = { version = "1.0.60", features = ["full", "extra-traits"] } tar = "0.4.35" tokio = "1.0" diff --git a/cli/src/config.rs b/cli/src/config.rs index 4af74cd7ec..60271b6dec 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -2,6 +2,7 @@ use crate::is_hidden; use anchor_client::Cluster; use anchor_syn::idl::Idl; use anyhow::{anyhow, Context, Error, Result}; +use cargo_toml::{Inheritable, Package}; use clap::{ArgEnum, Parser}; use heck::SnakeCase; use reqwest::Url; @@ -97,7 +98,10 @@ impl Manifest { pub fn version(&self) -> String { match &self.package { - Some(package) => package.version.to_string(), + Some(Package { + version: Inheritable::Set(v), + .. + }) => v.to_string(), _ => "0.0.0".to_string(), } } diff --git a/client/Cargo.toml b/client/Cargo.toml index 54fea85279..228c13c112 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -15,8 +15,8 @@ anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } -solana-account-decoder = ">=1.10.29,<1.17" -solana-client = ">=1.10.29,<1.17" -solana-sdk = ">=1.10.29,<1.17" +solana-account-decoder = ">=1.10.29,<1.18" +solana-client = ">=1.10.29,<1.18" +solana-sdk = ">=1.10.29,<1.18" thiserror = "1.0.20" url = "2.2.2" diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml index 027ca38b19..696d5223a1 100644 --- a/client/example/Cargo.toml +++ b/client/example/Cargo.toml @@ -16,4 +16,4 @@ shellexpand = "2.1.0" anyhow = "1.0.32" rand = "0.7.3" clap = { version = "3.0.0-rc.0", features = ["derive"] } -solana-sdk = ">=1.10.29,<1.17" +solana-sdk = ">=1.10.29,<1.18" diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 0acaed642f..9c7a8a2e2b 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -40,5 +40,6 @@ base64 = "0.13.0" bincode = "1.3.3" borsh = "0.9.3" bytemuck = "1.4.0" -solana-program = ">=1.10.29,<1.17" +solana-program = ">=1.10.29,<1.18" thiserror = "1.0.20" +ahash = "=0.8.6" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 0ad1c06f11..12984685fa 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -22,6 +22,6 @@ dex = ["serum_dex"] anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } -solana-program = ">=1.10.29,<1.17" +solana-program = ">=1.10.29" spl-associated-token-account = { version = "1.1.0", features = ["no-entrypoint"], optional = true } spl-token = { version = "3.3.0", features = ["no-entrypoint"], optional = true } From 4f84af375a2d8bc856302f9fe3941e25cedefa31 Mon Sep 17 00:00:00 2001 From: Brett Etter Date: Tue, 16 Jan 2024 14:03:13 -0600 Subject: [PATCH 43/45] Bumped version --- Cargo.lock | 28 ++++++++++++------------ cli/Cargo.toml | 8 +++---- client/Cargo.toml | 4 ++-- lang/Cargo.toml | 24 ++++++++++---------- lang/attribute/access-control/Cargo.toml | 4 ++-- lang/attribute/account/Cargo.toml | 4 ++-- lang/attribute/constant/Cargo.toml | 4 ++-- lang/attribute/error/Cargo.toml | 4 ++-- lang/attribute/event/Cargo.toml | 4 ++-- lang/attribute/interface/Cargo.toml | 4 ++-- lang/attribute/program/Cargo.toml | 4 ++-- lang/attribute/state/Cargo.toml | 4 ++-- lang/derive/accounts/Cargo.toml | 4 ++-- lang/syn/Cargo.toml | 2 +- spl/Cargo.toml | 4 ++-- 15 files changed, 54 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 072c0ceb09..dc30dee419 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ checksum = "6b2d54853319fd101b8dd81de382bcbf3e03410a64d8928bbee85a3e7dcde483" [[package]] name = "anchor-attribute-access-control" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -144,7 +144,7 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "proc-macro2 1.0.76", @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "proc-macro2 1.0.76", @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -174,7 +174,7 @@ dependencies = [ [[package]] name = "anchor-attribute-interface" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -186,7 +186,7 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -197,7 +197,7 @@ dependencies = [ [[package]] name = "anchor-attribute-state" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -208,7 +208,7 @@ dependencies = [ [[package]] name = "anchor-cli" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-client", "anchor-lang", @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "anchor-client" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-lang", "anyhow", @@ -257,7 +257,7 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-syn", "anyhow", @@ -268,7 +268,7 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.25.23" +version = "0.25.25" dependencies = [ "ahash 0.8.6", "anchor-attribute-access-control", @@ -291,7 +291,7 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anchor-lang", "mpl-token-metadata", @@ -303,7 +303,7 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.25.23" +version = "0.25.25" dependencies = [ "anyhow", "bs58 0.3.1", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b0fed86282..454e1bfd04 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-cli" -version = "0.25.23" +version = "0.25.25" authors = ["armaniferrante "] edition = "2021" repository = "https://github.com/coral-xyz/anchor" @@ -17,9 +17,9 @@ dev = [] default = [] [dependencies] -anchor-client = { path = "../client", version = "0.25.23", registry = "star-atlas" } -anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } -anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.23", registry = "star-atlas" } +anchor-client = { path = "../client", version = "0.25.25", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.25", registry = "star-atlas" } +anchor-syn = { path = "../lang/syn", features = ["idl", "init-if-needed"], version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" cargo_toml = "0.18.0" chrono = "0.4.19" diff --git a/client/Cargo.toml b/client/Cargo.toml index 228c13c112..4cc83e8927 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-client" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -11,7 +11,7 @@ publish = ["star-atlas"] debug = [] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas" } +anchor-lang = { path = "../lang", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" regex = "1.4.5" serde = { version = "1.0.122", features = ["derive"] } diff --git a/lang/Cargo.toml b/lang/Cargo.toml index 9c7a8a2e2b..ce843846c8 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-lang" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" edition = "2021" @@ -26,15 +26,15 @@ anchor-debug = [ ] [dependencies] -anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-account = { path = "./attribute/account", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-error = { path = "./attribute/error", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-event = { path = "./attribute/event", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-program = { path = "./attribute/program", version = "0.25.23", registry = "star-atlas" } -anchor-attribute-state = { path = "./attribute/state", version = "0.25.23", registry = "star-atlas" } -anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.23", registry = "star-atlas" } +anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-account = { path = "./attribute/account", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-constant = { path = "./attribute/constant", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-error = { path = "./attribute/error", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-event = { path = "./attribute/event", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-interface = { path = "./attribute/interface", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-program = { path = "./attribute/program", version = "0.25.25", registry = "star-atlas" } +anchor-attribute-state = { path = "./attribute/state", version = "0.25.25", registry = "star-atlas" } +anchor-derive-accounts = { path = "./derive/accounts", version = "0.25.25", registry = "star-atlas" } arrayref = "0.3.6" base64 = "0.13.0" bincode = "1.3.3" @@ -42,4 +42,6 @@ borsh = "0.9.3" bytemuck = "1.4.0" solana-program = ">=1.10.29,<1.18" thiserror = "1.0.20" -ahash = "=0.8.6" + +# Locked due to msrv change +ahash = ">=0.8.0,<=0.8.6" diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml index 7b0c46e303..7884c86150 100644 --- a/lang/attribute/access-control/Cargo.toml +++ b/lang/attribute/access-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-access-control" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml index 90d2b8689b..c40ebbb1ad 100644 --- a/lang/attribute/account/Cargo.toml +++ b/lang/attribute/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-account" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" bs58 = "0.4.0" proc-macro2 = "1.0" diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml index 82201bd66b..427058a51b 100644 --- a/lang/attribute/constant/Cargo.toml +++ b/lang/attribute/constant/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-constant" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,6 +15,6 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } proc-macro2 = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml index cab2ddf7c0..c26fe42edd 100644 --- a/lang/attribute/error/Cargo.toml +++ b/lang/attribute/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-error" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } proc-macro2 = "1.0" quote = "1.0" syn = { version = "1.0.60", features = ["full"] } diff --git a/lang/attribute/event/Cargo.toml b/lang/attribute/event/Cargo.toml index e393ac4ca1..2812d9f82c 100644 --- a/lang/attribute/event/Cargo.toml +++ b/lang/attribute/event/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-event" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas", features = ["hash"] } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas", features = ["hash"] } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/interface/Cargo.toml b/lang/attribute/interface/Cargo.toml index 9739e65282..055b3cf1f3 100644 --- a/lang/attribute/interface/Cargo.toml +++ b/lang/attribute/interface/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-interface" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" heck = "0.3.2" proc-macro2 = "1.0" diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml index 86d2ee2d19..3fef595387 100644 --- a/lang/attribute/program/Cargo.toml +++ b/lang/attribute/program/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-program" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/attribute/state/Cargo.toml b/lang/attribute/state/Cargo.toml index f986affdc1..ee53ac2288 100644 --- a/lang/attribute/state/Cargo.toml +++ b/lang/attribute/state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-attribute-state" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/staratlasmeta/anchor.git" license = "Apache-2.0" @@ -15,7 +15,7 @@ proc-macro = true anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml index c15568a15a..90b4721760 100644 --- a/lang/derive/accounts/Cargo.toml +++ b/lang/derive/accounts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-derive-accounts" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" @@ -17,7 +17,7 @@ default = [] anchor-debug = ["anchor-syn/anchor-debug"] [dependencies] -anchor-syn = { path = "../../syn", version = "0.25.23", registry = "star-atlas" } +anchor-syn = { path = "../../syn", version = "0.25.25", registry = "star-atlas" } anyhow = "1.0.32" proc-macro2 = "1.0" quote = "1.0" diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml index 9db6388629..9ccfe35ece 100644 --- a/lang/syn/Cargo.toml +++ b/lang/syn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-syn" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] repository = "https://github.com/coral-xyz/anchor" license = "Apache-2.0" diff --git a/spl/Cargo.toml b/spl/Cargo.toml index 12984685fa..380ebeb7cc 100644 --- a/spl/Cargo.toml +++ b/spl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "anchor-spl" -version = "0.25.23" +version = "0.25.25" authors = ["Serum Foundation "] edition = "2021" license = "Apache-2.0" @@ -19,7 +19,7 @@ metadata = ["mpl-token-metadata"] dex = ["serum_dex"] [dependencies] -anchor-lang = { path = "../lang", version = "0.25.23", registry = "star-atlas", features = ["derive"] } +anchor-lang = { path = "../lang", version = "0.25.25", registry = "star-atlas", features = ["derive"] } mpl-token-metadata = { version = "1.2.7", optional = true, features = ["no-entrypoint"] } serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true } solana-program = ">=1.10.29" From 961e70c8f8b168cbf0263ed797102f91aa4c8760 Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:25:10 -0500 Subject: [PATCH 44/45] feat: add instruction builder ffi cbindgen support (#29) * feat: add instruction builder ffi cbindgen support * this is not wasm --- lang/Cargo.toml | 1 + lang/src/lib.rs | 4 ++ lang/src/unreal.rs | 71 +++++++++++++++++++ .../src/codegen/accounts/__client_accounts.rs | 28 +++++--- lang/syn/src/codegen/accounts/mod.rs | 7 +- lang/syn/src/codegen/program/instruction.rs | 66 ++++++++++++++++- rust-toolchain.toml | 2 +- 7 files changed, 164 insertions(+), 15 deletions(-) create mode 100644 lang/src/unreal.rs diff --git a/lang/Cargo.toml b/lang/Cargo.toml index ce843846c8..003a7f7930 100644 --- a/lang/Cargo.toml +++ b/lang/Cargo.toml @@ -11,6 +11,7 @@ publish = ["star-atlas"] [features] init-if-needed = ["anchor-derive-accounts/init-if-needed"] derive = [] +unreal = [] default = [] anchor-debug = [ "anchor-attribute-access-control/anchor-debug", diff --git a/lang/src/lib.rs b/lang/src/lib.rs index c6f5e2ad9a..bf6e9d7e2f 100644 --- a/lang/src/lib.rs +++ b/lang/src/lib.rs @@ -23,6 +23,9 @@ //! //! Presented here are the Rust primitives for building on Solana. +#[cfg(feature = "unreal")] +pub mod unreal; + extern crate self as anchor_lang; use bytemuck::{Pod, Zeroable}; @@ -45,6 +48,7 @@ pub mod idl; pub mod system_program; mod vec; + pub use crate::bpf_upgradeable_state::*; pub use anchor_attribute_access_control::access_control; pub use anchor_attribute_account::{account, declare_id, zero_copy}; diff --git a/lang/src/unreal.rs b/lang/src/unreal.rs new file mode 100644 index 0000000000..5832cf86ef --- /dev/null +++ b/lang/src/unreal.rs @@ -0,0 +1,71 @@ +use std::alloc::{GlobalAlloc, Layout}; +use std::ffi::c_void; +use std::ptr::slice_from_raw_parts_mut; +use solana_program::instruction::{AccountMeta, Instruction}; +use solana_program::pubkey::Pubkey; + +extern "C" { + // FMemory::Malloc + fn rust_malloc(size: usize, alignment: usize) -> *mut c_void; + // FMemory::Free + fn rust_free(ptr: *mut c_void); +} + +struct Alloc; + +unsafe impl GlobalAlloc for Alloc { + unsafe fn alloc(&self, layout: Layout) -> *mut u8 { + unsafe { rust_malloc(layout.size(), layout.align()) as *mut u8 } + } + + unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) { + unsafe { rust_free(ptr as *mut c_void) } + } +} + +#[global_allocator] +static ALLOC: Alloc = Alloc; + +#[repr(C)] +pub struct BetterCInstruction { + pub program_id: Pubkey, + /// Metadata describing accounts that should be passed to the program. + pub accounts: *mut AccountMeta, + pub accounts_len: usize, + /// Opaque data passed to the program for its own interpretation. + pub data: *mut u8, + pub data_len: usize, +} + +impl Drop for BetterCInstruction { + fn drop(&mut self) { + unsafe { drop_better_c_instruction(self) } + } +} + +impl From for BetterCInstruction { + fn from(value: Instruction) -> Self { + let accounts = Box::leak(value.accounts.into_boxed_slice()); + let data = Box::leak(value.data.into_boxed_slice()); + Self { + program_id: value.program_id, + accounts: accounts.as_mut_ptr(), + accounts_len: accounts.len(), + data: data.as_mut_ptr(), + data_len: data.len(), + } + } +} + +/// # Safety +/// Don't call this thing in rust code +#[no_mangle] +pub unsafe extern "C" fn drop_better_c_instruction(v: &mut BetterCInstruction) { + unsafe { + drop(Box::from_raw(slice_from_raw_parts_mut( + v.accounts, + v.accounts_len, + ))); + drop(Box::from_raw(slice_from_raw_parts_mut(v.data, v.data_len))); + } +} diff --git a/lang/syn/src/codegen/accounts/__client_accounts.rs b/lang/syn/src/codegen/accounts/__client_accounts.rs index 90a82069fc..7c1a49e70e 100644 --- a/lang/syn/src/codegen/accounts/__client_accounts.rs +++ b/lang/syn/src/codegen/accounts/__client_accounts.rs @@ -1,7 +1,8 @@ use crate::{AccountField, AccountsStruct, Ty}; use heck::SnakeCase; -use quote::quote; +use quote::{format_ident, quote}; use std::str::FromStr; +use crate::codegen::accounts::make_unreal_accounts; // Generates the private `__client_accounts` mod implementation, containing // a generated struct mapping 1-1 to the `Accounts` struct, except with @@ -12,8 +13,8 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { "__client_accounts_{}", accs.ident.to_string().to_snake_case() ) - .parse() - .unwrap(); + .parse() + .unwrap(); let account_struct_fields: Vec = accs .fields @@ -28,19 +29,20 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { "#[doc = r#\"{}\"#]", docs_line )) - .unwrap() + .unwrap() }) .collect() } else { quote!() }; + let unreal_accounts = make_unreal_accounts(&format_ident!("{}", s.symbol)); let symbol: proc_macro2::TokenStream = format!( "__client_accounts_{0}::{1}", s.symbol.to_snake_case(), - s.symbol, + unreal_accounts, ) - .parse() - .unwrap(); + .parse() + .unwrap(); quote! { #docs pub #name: #symbol @@ -55,7 +57,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { "#[doc = r#\"{}\"#]", docs_line )) - .unwrap() + .unwrap() }) .collect() } else { @@ -133,7 +135,9 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { "#[doc = \" Generated client accounts for [`{}`].\"]", name )) - .unwrap(); + .unwrap(); + + let cbg_name = make_unreal_accounts(name); quote! { /// An internal, Anchor generated module. This is used (as an @@ -151,10 +155,13 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { #(#re_exports)* #struct_doc + #[repr(C)] #[derive(anchor_lang::AnchorSerialize)] - pub struct #name { + pub struct #cbg_name { #(#account_struct_fields),* } + + pub type #name = #cbg_name; #[automatically_derived] impl anchor_lang::ToAccountMetas for #name { @@ -169,3 +176,4 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream { } } } + diff --git a/lang/syn/src/codegen/accounts/mod.rs b/lang/syn/src/codegen/accounts/mod.rs index 3a239cbe33..3f3789722b 100644 --- a/lang/syn/src/codegen/accounts/mod.rs +++ b/lang/syn/src/codegen/accounts/mod.rs @@ -1,10 +1,15 @@ use crate::AccountsStruct; -use quote::quote; +use quote::{format_ident, quote}; use std::iter; use syn::punctuated::Punctuated; use syn::{ConstParam, LifetimeDef, Token, TypeParam}; use syn::{GenericParam, PredicateLifetime, WhereClause, WherePredicate}; +pub fn make_unreal_accounts(ident: &syn::Ident) -> syn::Ident { + format_ident!("{}Accounts", ident) +} + + mod __client_accounts; mod __cpi_client_accounts; mod constraints; diff --git a/lang/syn/src/codegen/program/instruction.rs b/lang/syn/src/codegen/program/instruction.rs index a5ba268a9b..646c5377a1 100644 --- a/lang/syn/src/codegen/program/instruction.rs +++ b/lang/syn/src/codegen/program/instruction.rs @@ -1,8 +1,11 @@ +use std::str::FromStr; use crate::codegen::program::common::*; use crate::parser; use crate::Program; -use heck::CamelCase; -use quote::quote; +use heck::{CamelCase, SnakeCase}; +use quote::{format_ident, quote}; +use crate::codegen::accounts::make_unreal_accounts; + pub fn generate(program: &Program) -> proc_macro2::TokenStream { let ctor_variant = match &program.state { @@ -147,24 +150,81 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { } } }; + + let cbg_ix_name = format_ident!("{}_{name}", program.name.to_string().to_snake_case()); + + let accounts_ident = ix.anchor_ident.clone(); + + let unreal_name = make_unreal_accounts(&accounts_ident); + + let ix_docs = if let Some(ref docs) = ix.docs { + docs.iter() + .map(|docs_line| { + proc_macro2::TokenStream::from_str(&format!( + "#[doc = r#\"{}\"#]", + docs_line + )) + .unwrap() + }) + .collect() + } else { + quote!() + }; + // If no args, output a "unit" variant instead of a struct variant. if ix.args.is_empty() { quote! { /// Instruction. #[derive(AnchorSerialize, AnchorDeserialize)] pub struct #ix_name_camel; - + #ix_data_trait + + #[cfg(feature = "unreal")] + #ix_docs + #[no_mangle] + pub unsafe extern "C" fn #cbg_ix_name(accounts: crate::accounts::#unreal_name, remaining_accounts: *const AccountMeta, remaining_len: usize) -> anchor_lang::unreal::BetterCInstruction { + let mut metas = accounts.to_account_metas(None); + if remaining_len > 0 { + let remaining = unsafe { + slice::from_raw_parts(remaining_accounts, remaining_len) + }; + metas.extend_from_slice(remaining); + } + + let ix = Instruction::new_with_bytes(crate::ID, &[], metas); + ix.into() + } } } else { quote! { /// Instruction. #[derive(AnchorSerialize, AnchorDeserialize)] + #[repr(C)] pub struct #ix_name_camel { #(#raw_args),* } #ix_data_trait + + #[cfg(feature = "unreal")] + #ix_docs + #[no_mangle] + pub unsafe extern "C" fn #cbg_ix_name(accounts: crate::accounts::#unreal_name, args: *const #ix_name_camel, remaining_accounts: *const AccountMeta, remaining_len: usize) -> anchor_lang::unreal::BetterCInstruction { + let mut metas = accounts.to_account_metas(None); + if remaining_len > 0 { + let remaining = unsafe { + slice::from_raw_parts(remaining_accounts, remaining_len) + }; + metas.extend_from_slice(remaining); + } + + let args = unsafe { &*args }; + let bytes = args.try_to_vec().expect("Failed to serialize instruction args"); + + let ix = Instruction::new_with_bytes(crate::ID, &bytes, metas); + ix.into() + } } } }) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index dedba31583..fe2354af5b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Check https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html # for valid toolchains. -channel = "nightly-2023-03-22" +channel = "nightly-2023-11-09" components = ["rustfmt", "clippy"] profile = "minimal" From a0109b637e5645739beb4d90cbe6f63722bdea4f Mon Sep 17 00:00:00 2001 From: Sammy Harris <41593264+stegaBOB@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:08:51 -0500 Subject: [PATCH 45/45] Improved cbindgen support (#30) * feat: add instruction builder ffi cbindgen support * this is not wasm * added #[remaining_accounts] macro --- lang/src/unreal.rs | 4 +- lang/syn/src/codegen/program/instruction.rs | 91 ++++++++++++--------- lang/syn/src/lib.rs | 1 + lang/syn/src/parser/program/instructions.rs | 10 ++- lang/syn/src/parser/program/mod.rs | 16 +++- 5 files changed, 78 insertions(+), 44 deletions(-) diff --git a/lang/src/unreal.rs b/lang/src/unreal.rs index 5832cf86ef..b8b19e6e37 100644 --- a/lang/src/unreal.rs +++ b/lang/src/unreal.rs @@ -1,8 +1,8 @@ +use solana_program::instruction::{AccountMeta, Instruction}; +use solana_program::pubkey::Pubkey; use std::alloc::{GlobalAlloc, Layout}; use std::ffi::c_void; use std::ptr::slice_from_raw_parts_mut; -use solana_program::instruction::{AccountMeta, Instruction}; -use solana_program::pubkey::Pubkey; extern "C" { // FMemory::Malloc diff --git a/lang/syn/src/codegen/program/instruction.rs b/lang/syn/src/codegen/program/instruction.rs index 646c5377a1..ddb75b9b8e 100644 --- a/lang/syn/src/codegen/program/instruction.rs +++ b/lang/syn/src/codegen/program/instruction.rs @@ -150,13 +150,9 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { } } }; - - let cbg_ix_name = format_ident!("{}_{name}", program.name.to_string().to_snake_case()); - + let accounts_ident = ix.anchor_ident.clone(); - let unreal_name = make_unreal_accounts(&accounts_ident); - let ix_docs = if let Some(ref docs) = ix.docs { docs.iter() .map(|docs_line| { @@ -171,6 +167,52 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { quote!() }; + let cbg_ix_name = format_ident!("{}_{name}", program.name.to_string().to_snake_case()); + let unreal_name = make_unreal_accounts(&accounts_ident); + let mut unreal_parameters = vec![quote!(accounts: crate::accounts::#unreal_name)]; + + let metas = if ix.needs_remaining_accounts { + unreal_parameters.extend([quote!(remaining_accounts: *const AccountMeta), quote!(remaining_len: usize)]); + quote! { + let mut metas = accounts.to_account_metas(None); + if remaining_len > 0 { + let remaining = unsafe { + ::core::slice::from_raw_parts(remaining_accounts, remaining_len) + }; + metas.extend_from_slice(remaining); + } + } + } else { + quote! { + let metas = accounts.to_account_metas(None); + } + }; + + let unreal_arg_logic = if !ix.args.is_empty() { + unreal_parameters.push(quote!(args: *const #ix_name_camel)); + quote! { + let args = unsafe { &*args }; + let bytes = args.try_to_vec().expect("Failed to serialize instruction args"); + } + } else { + quote! { + let bytes: [u8; 0] = []; + } + }; + + let unreal_function = quote! { + #[cfg(feature = "unreal")] + #ix_docs + #[no_mangle] + pub unsafe extern "C" fn #cbg_ix_name(#(#unreal_parameters),*) -> anchor_lang::unreal::BetterCInstruction { + #metas + #unreal_arg_logic + let ix = Instruction::new_with_bytes(crate::ID, &bytes, metas); + ix.into() + } + }; + + // If no args, output a "unit" variant instead of a struct variant. if ix.args.is_empty() { quote! { @@ -179,22 +221,8 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { pub struct #ix_name_camel; #ix_data_trait - - #[cfg(feature = "unreal")] - #ix_docs - #[no_mangle] - pub unsafe extern "C" fn #cbg_ix_name(accounts: crate::accounts::#unreal_name, remaining_accounts: *const AccountMeta, remaining_len: usize) -> anchor_lang::unreal::BetterCInstruction { - let mut metas = accounts.to_account_metas(None); - if remaining_len > 0 { - let remaining = unsafe { - slice::from_raw_parts(remaining_accounts, remaining_len) - }; - metas.extend_from_slice(remaining); - } - - let ix = Instruction::new_with_bytes(crate::ID, &[], metas); - ix.into() - } + + #unreal_function } } else { quote! { @@ -204,27 +232,10 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream { pub struct #ix_name_camel { #(#raw_args),* } - + #ix_data_trait - #[cfg(feature = "unreal")] - #ix_docs - #[no_mangle] - pub unsafe extern "C" fn #cbg_ix_name(accounts: crate::accounts::#unreal_name, args: *const #ix_name_camel, remaining_accounts: *const AccountMeta, remaining_len: usize) -> anchor_lang::unreal::BetterCInstruction { - let mut metas = accounts.to_account_metas(None); - if remaining_len > 0 { - let remaining = unsafe { - slice::from_raw_parts(remaining_accounts, remaining_len) - }; - metas.extend_from_slice(remaining); - } - - let args = unsafe { &*args }; - let bytes = args.try_to_vec().expect("Failed to serialize instruction args"); - - let ix = Instruction::new_with_bytes(crate::ID, &bytes, metas); - ix.into() - } + #unreal_function } } }) diff --git a/lang/syn/src/lib.rs b/lang/syn/src/lib.rs index 675745bf06..02b5aed739 100644 --- a/lang/syn/src/lib.rs +++ b/lang/syn/src/lib.rs @@ -85,6 +85,7 @@ pub struct StateInterface { pub struct Ix { pub raw_method: ItemFn, pub ident: Ident, + pub needs_remaining_accounts: bool, pub docs: Option>, pub args: Vec, pub returns: IxReturn, diff --git a/lang/syn/src/parser/program/instructions.rs b/lang/syn/src/parser/program/instructions.rs index 66aaf1a765..5a394442b8 100644 --- a/lang/syn/src/parser/program/instructions.rs +++ b/lang/syn/src/parser/program/instructions.rs @@ -1,3 +1,4 @@ +use syn::Meta; use crate::parser::docs; use crate::parser::program::ctx_accounts_ident; use crate::{FallbackFn, Ix, IxArg, IxReturn}; @@ -27,7 +28,14 @@ pub fn parse(program_mod: &syn::ItemMod) -> ParseResult<(Vec, Option path.is_ident("remaining_accounts"), + _ => false, + } + }); Ok(Ix { + needs_remaining_accounts, raw_method: method.clone(), ident: method.sig.ident.clone(), docs, @@ -118,7 +126,7 @@ pub fn parse_return(method: &syn::ItemFn) -> ParseResult { return Err(ParseError::new( ty.span(), "expected generic return type to be a type", - )) + )); } }; Ok(IxReturn { ty }) diff --git a/lang/syn/src/parser/program/mod.rs b/lang/syn/src/parser/program/mod.rs index 87c298437a..2741240afd 100644 --- a/lang/syn/src/parser/program/mod.rs +++ b/lang/syn/src/parser/program/mod.rs @@ -6,10 +6,24 @@ use syn::spanned::Spanned; mod instructions; mod state; -pub fn parse(program_mod: syn::ItemMod) -> ParseResult { +pub fn parse(mut program_mod: syn::ItemMod) -> ParseResult { let state = state::parse(&program_mod)?; let docs = docs::parse(&program_mod.attrs); let (ixs, fallback_fn) = instructions::parse(&program_mod)?; + // strip #[remaining_accounts] from the program mod items. + program_mod.content.iter_mut().for_each(|(_, items)| { + for item in items.iter_mut() { + if let syn::Item::Fn(item_fn) = item { + item_fn.attrs.retain(|attr| { + match attr.parse_meta() { + Ok(syn::Meta::Path(path)) => !path.is_ident("remaining_accounts"), + _ => true, + } + }); + } + } + }); + Ok(Program { state, ixs,