From fc9990dc0a6652a3bc5ea2fdaa54a1dd21607904 Mon Sep 17 00:00:00 2001 From: XuananLe Date: Tue, 16 Jul 2024 16:48:15 +0700 Subject: [PATCH 1/2] chore : upgrade anchor-lang to 0.30.1 and solana-program to 2.0.2 - This commit upgrade anchor-lang to 0.30.1, solana-program to 2.0.2 and also borsh, borsh-derive to the latest version which is 1.5.1. - Replace the decrepitated try_to_vec of borsh to caculate Account Span to a safer method std::mem::size_of_val(&T). --- Cargo.lock | 458 ++++++++--- Cargo.toml | 6 +- .../anchor-program-example/Cargo.toml | 2 +- .../native/program/src/instructions/create.rs | 2 +- .../anchor-program-example/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../anchor/programs/close-account/Cargo.toml | 2 +- .../close-account/native/program/Cargo.toml | 6 +- .../program/src/instructions/create_user.rs | 2 +- .../anchor/programs/counter_anchor/Cargo.toml | 2 +- basics/counter/mpl-stack/Cargo.toml | 6 +- basics/counter/native/program/Cargo.toml | 4 +- .../programs/create-system-account/Cargo.toml | 2 +- .../create-account/native/program/Cargo.toml | 2 +- .../anchor/programs/hand/Cargo.toml | 2 +- .../anchor/programs/lever/Cargo.toml | 2 +- .../native/programs/hand/Cargo.toml | 6 +- .../native/programs/lever/Cargo.toml | 6 +- .../native/programs/lever/src/lib.rs | 2 +- .../anchor/programs/favorites/Cargo.toml | 4 +- basics/hello-solana/anchor/Anchor.toml | 2 +- basics/hello-solana/anchor/Cargo.toml | 1 + .../anchor/programs/hello-solana/Cargo.toml | 2 +- basics/hello-solana/native/program/Cargo.toml | 2 +- .../anchor-program-example/Cargo.toml | 2 +- .../pda-rent-payer/native/program/Cargo.toml | 6 +- .../processing-instructions/Cargo.toml | 2 +- .../native/program/Cargo.toml | 6 +- .../anchor/programs/anchor-realloc/Cargo.toml | 2 +- basics/realloc/native/program/Cargo.toml | 6 +- .../native/program/src/instructions/create.rs | 2 +- .../program/src/instructions/reallocate.rs | 4 +- .../anchor/programs/rent-example/Cargo.toml | 2 +- basics/rent/native/program/Cargo.toml | 6 +- .../anchor/programs/carnival/Cargo.toml | 2 +- .../native/program/Cargo.toml | 6 +- .../anchor/programs/transfer-sol/Cargo.toml | 2 +- basics/transfer-sol/native/program/Cargo.toml | 6 +- .../anchor/programs/cnft-burn/Cargo.toml | 6 +- .../anchor/programs/cnft-vault/Cargo.toml | 4 +- .../cutils/anchor/programs/cutils/Cargo.toml | 4 +- .../anchor/programs/pythexample/Cargo.toml | 4 +- package.json | 7 +- pnpm-lock.yaml | 762 ++++++++++++++---- .../anchor/programs/create-token/Cargo.toml | 4 +- tokens/create-token/native/program/Cargo.toml | 10 +- tokens/create-token/native/program/src/lib.rs | 2 +- .../escrow/anchor/programs/escrow/Cargo.toml | 6 +- .../anchor/programs/nft-minter/Cargo.toml | 4 +- tokens/nft-minter/native/program/Cargo.toml | 12 +- .../anchor/programs/token-minter/Cargo.toml | 4 +- .../native/program/Cargo.toml | 12 +- .../programs/spl-token-minter/Cargo.toml | 4 +- .../native/program/Cargo.toml | 12 +- .../basics/anchor/programs/basics/Cargo.toml | 4 +- .../anchor/programs/cpi-guard/Cargo.toml | 4 +- .../programs/default-account-state/Cargo.toml | 4 +- .../native/program/Cargo.toml | 10 +- .../group/anchor/programs/group/Cargo.toml | 6 +- .../programs/immutable-owner/Cargo.toml | 4 +- .../programs/interest-bearing/Cargo.toml | 4 +- .../anchor/programs/memo-transfer/Cargo.toml | 4 +- .../anchor/programs/metadata/Cargo.toml | 8 +- .../programs/mint-close-authority/Cargo.toml | 4 +- .../native/program/Cargo.toml | 10 +- .../programs/non-transferable/Cargo.toml | 4 +- .../programs/permanent-delegate/Cargo.toml | 4 +- .../anchor/programs/transfer-fee/Cargo.toml | 4 +- .../transfer-fee/native/program/Cargo.toml | 6 +- .../anchor/programs/transfer-hook/Cargo.toml | 10 +- .../anchor/programs/transfer-hook/Cargo.toml | 8 +- .../anchor/programs/transfer-hook/Cargo.toml | 8 +- .../anchor/programs/transfer-hook/Cargo.toml | 8 +- .../transfer-tokens/native/program/Cargo.toml | 12 +- .../native/program/Cargo.toml | 8 +- 75 files changed, 1161 insertions(+), 411 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52daf5519..48513303d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ name = "account-data-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anchor-attribute-access-control" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7368e171b3a317885dc08ec0f74eed9d0ad6c726cc819593aed81440dca926" +checksum = "47fe28365b33e8334dd70ae2f34a43892363012fe239cf37d2ee91693575b1f8" dependencies = [ "anchor-syn", "proc-macro2", @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f527df85a8cba3f2bea04e46ed71b66e525ea378c7fec538aa205f4520b73e31" +checksum = "3c288d496168268d198d9b53ee9f4f9d260a55ba4df9877ea1d4486ad6109e0f" dependencies = [ "anchor-syn", "bs58 0.5.1", @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb1dc1845cf8636c2e046a274ca074dabd3884ac8ed11cc4ed64b7e8ef5a318" +checksum = "49b77b6948d0eeaaa129ce79eea5bbbb9937375a9241d909ca8fb9e006bb6e90" dependencies = [ "anchor-syn", "quote", @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "anchor-attribute-error" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f382e41514c59a77ffa7bb1a47df9a0359564a749b6934485c742c11962e540" +checksum = "4d20bb569c5a557c86101b944721d865e1fd0a4c67c381d31a44a84f07f84828" dependencies = [ "anchor-syn", "quote", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "anchor-attribute-event" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473a122aeed3f6b666438236338d2ef7833ee5fdc5688e1baa80185d61088a53" +checksum = "4cebd8d0671a3a9dc3160c48598d652c34c77de6be4d44345b8b514323284d57" dependencies = [ "anchor-syn", "proc-macro2", @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f88c7ffe2eb40aeac43ffd0d74a6671581158aedfaa0552330a2ef92fa5c889" +checksum = "efb2a5eb0860e661ab31aff7bb5e0288357b176380e985bade4ccb395981b42d" dependencies = [ "anchor-lang-idl", "anchor-syn", @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "anchor-derive-accounts" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9b97c99dcec135aae0ff908c14bcfcd3e78cfc16a0c6f245135038f0e6d390" +checksum = "04368b5abef4266250ca8d1d12f4dff860242681e4ec22b885dcfe354fd35aa1" dependencies = [ "anchor-syn", "quote", @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "anchor-derive-serde" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbece98f6ad9c37070edc0841326c9623a249346cd74f433e7cef69b14f7f31d" +checksum = "e0bb0e0911ad4a70cab880cdd6287fe1e880a1a9d8e4e6defa8e9044b9796a6c" dependencies = [ "anchor-syn", "borsh-derive-internal 0.10.3", @@ -189,9 +189,9 @@ dependencies = [ [[package]] name = "anchor-derive-space" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8badbe2648bc99a85ee05a7a5f9512e5e2af8ffac71476a69350cb278057ac53" +checksum = "5ef415ff156dc82e9ecb943189b0cb241b3a6bfc26a180234dc21bd3ef3ce0cb" dependencies = [ "proc-macro2", "quote", @@ -200,9 +200,9 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e41feb9c1cd9f4b0fad1c004fc8f289183f3ce27e9db38fa6e434470c716fb1e" +checksum = "6620c9486d9d36a4389cab5e37dc34a42ed0bfaa62e6a75a2999ce98f8f2e373" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -220,21 +220,33 @@ dependencies = [ "borsh 0.10.3", "bytemuck", "getrandom 0.2.15", - "solana-program", + "solana-program 1.17.25", "thiserror", ] [[package]] name = "anchor-lang-idl" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29da81eae478b1bb846749b06b8a2cb9c6f9ed26ca793b0c916793fdf36adab" +checksum = "31cf97b4e6f7d6144a05e435660fcf757dbc3446d38d0e2b851d11ed13625bba" dependencies = [ - "anchor-syn", + "anchor-lang-idl-spec", "anyhow", + "heck", "regex", "serde", "serde_json", + "sha2 0.10.8", +] + +[[package]] +name = "anchor-lang-idl-spec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bdf143115440fe621bdac3a29a1f7472e09f6cd82b2aa569429a0c13f103838" +dependencies = [ + "anyhow", + "serde", ] [[package]] @@ -253,9 +265,9 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac53f2378bc08e89e20c2b893c01986ffd34cfbc69a17e35bd6f754753e9fdad" +checksum = "f99daacb53b55cfd37ce14d6c9905929721137fd4c67bbab44a19802aecb622f" dependencies = [ "anyhow", "bs58 0.5.1", @@ -440,6 +452,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bincode" version = "1.3.3" @@ -526,6 +544,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive 1.5.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -552,6 +580,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.66", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -629,18 +671,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", @@ -687,6 +729,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "checking-accounts-anchor-program-example" version = "0.1.0" @@ -698,7 +746,7 @@ dependencies = [ name = "checking-accounts-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 2.0.2", ] [[package]] @@ -723,9 +771,9 @@ dependencies = [ name = "close-account-native-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -765,17 +813,17 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" name = "counter-mpl-stack" version = "0.1.0" dependencies = [ - "borsh 0.9.3", + "borsh 1.5.1", "shank", - "solana-program", + "solana-program 2.0.2", ] [[package]] name = "counter-solana-native" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "solana-program", + "borsh 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -798,7 +846,7 @@ dependencies = [ name = "create-account-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 2.0.2", ] [[package]] @@ -812,19 +860,19 @@ dependencies = [ name = "cross-program-invocatio-native-hand" version = "0.1.0" dependencies = [ - "borsh 0.10.3", - "borsh-derive 0.10.3", + "borsh 1.5.1", + "borsh-derive 1.5.1", "cross-program-invocatio-native-lever", - "solana-program", + "solana-program 2.0.2", ] [[package]] name = "cross-program-invocatio-native-lever" version = "0.1.0" dependencies = [ - "borsh 0.10.3", - "borsh-derive 0.10.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -973,6 +1021,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "ed25519" version = "1.5.3" @@ -1033,6 +1087,14 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "favorites" +version = "0.1.0" +dependencies = [ + "anchor-lang", + "solana-program 2.0.2", +] + [[package]] name = "feature-probe" version = "0.1.1" @@ -1133,7 +1195,7 @@ dependencies = [ name = "hello-solana-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 2.0.2", ] [[package]] @@ -1145,6 +1207,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + [[package]] name = "hmac" version = "0.8.1" @@ -1550,7 +1621,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", ] [[package]] @@ -1605,11 +1676,34 @@ dependencies = [ "toml_edit 0.21.1", ] +[[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", + "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.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1625,18 +1719,18 @@ dependencies = [ name = "processing-instructions-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] name = "program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -1645,7 +1739,47 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", +] + +[[package]] +name = "pyth-sdk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7aeef4d5f0a9c98ff5af2ddd84a8b89919c512188305b497a9eb9afa97a949" +dependencies = [ + "borsh 0.10.3", + "borsh-derive 0.10.3", + "getrandom 0.2.15", + "hex", + "schemars", + "serde", +] + +[[package]] +name = "pyth-sdk-solana" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f913de6eb29d8def199af3beaee645e84c5281327d58777eff3fdd9f1d37105" +dependencies = [ + "borsh 0.10.3", + "borsh-derive 0.10.3", + "bytemuck", + "num-derive 0.3.3", + "num-traits", + "pyth-sdk", + "serde", + "solana-program 2.0.2", + "thiserror", +] + +[[package]] +name = "pythexample" +version = "0.1.0" +dependencies = [ + "anchor-lang", + "pyth-sdk", + "pyth-sdk-solana", ] [[package]] @@ -1781,9 +1915,9 @@ dependencies = [ name = "realloc-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -1835,9 +1969,9 @@ dependencies = [ name = "repository-layout-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] @@ -1867,6 +2001,30 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "schemars" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.66", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1908,6 +2066,17 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "serde_derive_internals" +version = "0.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "serde_json" version = "1.0.117" @@ -1998,30 +2167,31 @@ dependencies = [ [[package]] name = "shank" -version = "0.0.8" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2935c06d5a141ad2854622a014e30c5eeaa40096667df6bdd682dba9f8f81819" +checksum = "23d894855493d4ce613b25550fe1ed1c62d0af5486b984579ba55e3f8c9631d5" dependencies = [ "shank_macro", ] [[package]] name = "shank_macro" -version = "0.0.8" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab8a1eb550845e36c88007f4c00175eeeb436d2fc6c70d05207a338cba7519f" +checksum = "a9bf2645f8eebde043da69200195058e7b59806705104f908a31d05ca82844ce" dependencies = [ "proc-macro2", "quote", "shank_macro_impl", + "shank_render", "syn 1.0.109", ] [[package]] name = "shank_macro_impl" -version = "0.0.8" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ec51b35f2336faaeff44daf8952ddee4fe3e3693a313804ae7366f18a9967d" +checksum = "93d0593f48acb0a722906416b1f6b8926f6571eb9af16d566a7c65427f269f50" dependencies = [ "anyhow", "proc-macro2", @@ -2030,6 +2200,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "shank_render" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121175ba61809189f888dc5822ebfd30fa0d91e1e1f61d25a4d40b0847b3075e" +dependencies = [ + "proc-macro2", + "quote", + "shank_macro_impl", +] + [[package]] name = "signature" version = "1.6.4" @@ -2152,13 +2333,59 @@ dependencies = [ "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk-macro", + "solana-sdk-macro 1.17.25", "thiserror", "tiny-bip39", "wasm-bindgen", "zeroize", ] +[[package]] +name = "solana-program" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46779502637be111d121691aace200175ec1a57643f9760a36450b52d4eccdfd" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.22.1", + "bincode", + "bitflags", + "blake3", + "borsh 0.10.3", + "borsh 1.5.1", + "bs58 0.5.1", + "bv", + "bytemuck", + "bytemuck_derive", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.15", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memoffset", + "num-bigint", + "num-derive 0.4.2", + "num-traits", + "parking_lot", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-sdk-macro 2.0.2", + "thiserror", + "wasm-bindgen", +] + [[package]] name = "solana-sdk" version = "1.17.25" @@ -2206,8 +2433,8 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", - "solana-program", - "solana-sdk-macro", + "solana-program 1.17.25", + "solana-sdk-macro 1.17.25", "thiserror", "uriparse", "wasm-bindgen", @@ -2226,6 +2453,19 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "solana-sdk-macro" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa59130529bdfa2df945762785ea6c887cc07c901f52eb67ea4dfaa9e0b9c60b" +dependencies = [ + "bs58 0.5.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.66", +] + [[package]] name = "solana-security-txt" version = "1.1.1" @@ -2254,7 +2494,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program", + "solana-program 1.17.25", "solana-sdk", "subtle", "thiserror", @@ -2271,7 +2511,7 @@ dependencies = [ "borsh 0.10.3", "num-derive 0.4.2", "num-traits", - "solana-program", + "solana-program 2.0.2", "spl-token", "spl-token-2022 2.0.1", "thiserror", @@ -2284,7 +2524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa600f2fe56f32e923261719bae640d873edadbc5237681a39b8e37bfd4d263" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.2", "spl-discriminator-derive", ] @@ -2318,7 +2558,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program", + "solana-program 1.17.25", ] [[package]] @@ -2327,7 +2567,7 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58e9bae02de3405079a057fe244c867a08f92d48327d231fc60da831f94caf0a" dependencies = [ - "solana-program", + "solana-program 2.0.2", ] [[package]] @@ -2338,7 +2578,7 @@ checksum = "85a5db7e4efb1107b0b8e52a13f035437cdcb36ef99c58f6d467f089d9b2915a" dependencies = [ "borsh 0.10.3", "bytemuck", - "solana-program", + "solana-program 2.0.2", "solana-zk-token-sdk", "spl-program-error 0.3.1", ] @@ -2351,7 +2591,7 @@ checksum = "af92f74cd3b0fdfda59fef4b571a92123e4df0f67cc43f73163975d31118ef82" dependencies = [ "num-derive 0.3.3", "num-traits", - "solana-program", + "solana-program 1.17.25", "spl-program-error-derive 0.2.0", "thiserror", ] @@ -2364,7 +2604,7 @@ checksum = "7e0657b6490196971d9e729520ba934911ff41fbb2cb9004463dbe23cf8b4b4f" dependencies = [ "num-derive 0.4.2", "num-traits", - "solana-program", + "solana-program 2.0.2", "spl-program-error-derive 0.3.2", "thiserror", ] @@ -2399,7 +2639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82149a5a06b5f158d03904066375eaf0c8a2422557cc3d5a25d277260d9a3b16" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.17.25", "spl-discriminator", "spl-program-error 0.2.0", "spl-type-length-value 0.2.0", @@ -2412,7 +2652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56f335787add7fa711819f9e7c573f8145a5358a709446fe2d24bf2a88117c90" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.2", "spl-discriminator", "spl-pod", "spl-program-error 0.3.1", @@ -2430,7 +2670,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.2", - "solana-program", + "solana-program 2.0.2", "thiserror", ] @@ -2445,7 +2685,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program", + "solana-program 1.17.25", "solana-zk-token-sdk", "spl-memo 3.0.1", "spl-token", @@ -2464,7 +2704,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.2", - "solana-program", + "solana-program 2.0.2", "solana-security-txt", "solana-zk-token-sdk", "spl-memo 4.0.1", @@ -2484,7 +2724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb67fbacd587377a400aba81718abe4424d0e9d5ea510034d3b7f130d102153" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.2", "spl-discriminator", "spl-pod", "spl-program-error 0.3.1", @@ -2497,7 +2737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e16aa8f64b6e0eaab3f5034e84d867c8435d8216497b4543a4978a31f4b6e8a8" dependencies = [ "borsh 0.10.3", - "solana-program", + "solana-program 2.0.2", "spl-discriminator", "spl-pod", "spl-program-error 0.3.1", @@ -2515,7 +2755,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program", + "solana-program 1.17.25", "spl-discriminator", "spl-tlv-account-resolution 0.2.0", "spl-type-length-value 0.2.0", @@ -2530,7 +2770,7 @@ checksum = "5f6dfe329fcff44cbe2eea994bd8f737f0b0a69faed39e56f9b6ee03badf7e14" dependencies = [ "arrayref", "bytemuck", - "solana-program", + "solana-program 2.0.2", "spl-discriminator", "spl-pod", "spl-program-error 0.3.1", @@ -2545,7 +2785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1d085f426b33b8365fb98383d1b8b3925e21bdfe579c851ceaa7f511dbec191" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.17.25", "spl-discriminator", "spl-program-error 0.2.0", ] @@ -2557,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9ebd75d29c5f48de5f6a9c114e08531030b75b8ac2c557600ac7da0b73b1e8" dependencies = [ "bytemuck", - "solana-program", + "solana-program 2.0.2", "spl-discriminator", "spl-pod", "spl-program-error 0.3.1", @@ -2597,6 +2837,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "termcolor" version = "1.4.1" @@ -2664,9 +2916,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" name = "token-2022-default-account-state-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2677,7 +2929,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2688,7 +2940,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2699,7 +2951,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2710,7 +2962,7 @@ version = "0.1.0" dependencies = [ "borsh 0.10.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.17.25", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2791,9 +3043,9 @@ dependencies = [ name = "transfer-sol-program" version = "0.1.0" dependencies = [ - "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh 1.5.1", + "borsh-derive 1.5.1", + "solana-program 2.0.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 73434c972..314280498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "basics/account-data/anchor/programs/anchor-program-example", "basics/checking-accounts/native/program", "basics/checking-accounts/anchor/programs/anchor-program-example", - "basics/close-account/native/program", + "basics/close-account/native/program",` "basics/close-account/anchor/programs/close-account", "basics/counter/native/program", "basics/counter/anchor/programs/counter_anchor", @@ -14,6 +14,7 @@ members = [ "basics/create-account/anchor/programs/create-system-account", "basics/cross-program-invocation/native/programs/*", "basics/cross-program-invocation/anchor/programs/*", + "basics/favorites/anchor/programs/favorites", "basics/hello-solana/native/program", "basics/hello-solana/anchor/programs/*", "basics/pda-rent-payer/native/program", @@ -30,11 +31,12 @@ members = [ "basics/repository-layout/anchor/programs/*", "basics/transfer-sol/native/program", "basics/transfer-sol/anchor/programs/*", + "oracles/pyth/anchor/programs/pythexample", "tokens/token-2022/mint-close-authority/native/program", "tokens/token-2022/non-transferable/native/program", "tokens/token-2022/default-account-state/native/program", "tokens/token-2022/transfer-fee/native/program", - "tokens/token-2022/multiple-extensions/native/program" + "tokens/token-2022/multiple-extensions/native/program", ] resolver = "2" diff --git a/basics/account-data/anchor/programs/anchor-program-example/Cargo.toml b/basics/account-data/anchor/programs/anchor-program-example/Cargo.toml index eff334473..07a478e65 100644 --- a/basics/account-data/anchor/programs/anchor-program-example/Cargo.toml +++ b/basics/account-data/anchor/programs/anchor-program-example/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/account-data/native/program/src/instructions/create.rs b/basics/account-data/native/program/src/instructions/create.rs index aa4f2473e..25cdd6ee4 100644 --- a/basics/account-data/native/program/src/instructions/create.rs +++ b/basics/account-data/native/program/src/instructions/create.rs @@ -21,7 +21,7 @@ pub fn create_address_info( let payer = next_account_info(accounts_iter)?; let system_program = next_account_info(accounts_iter)?; - let account_span = (address_info.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&address_info); let lamports_required = (Rent::get()?).minimum_balance(account_span); invoke( diff --git a/basics/checking-accounts/anchor/programs/anchor-program-example/Cargo.toml b/basics/checking-accounts/anchor/programs/anchor-program-example/Cargo.toml index 2fe7d1770..ca85f9b78 100644 --- a/basics/checking-accounts/anchor/programs/anchor-program-example/Cargo.toml +++ b/basics/checking-accounts/anchor/programs/anchor-program-example/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/checking-accounts/native/program/Cargo.toml b/basics/checking-accounts/native/program/Cargo.toml index a385dce10..0b4b363c2 100644 --- a/basics/checking-accounts/native/program/Cargo.toml +++ b/basics/checking-accounts/native/program/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -solana-program = "=1.17.25" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/close-account/anchor/programs/close-account/Cargo.toml b/basics/close-account/anchor/programs/close-account/Cargo.toml index be7087731..41ba2a5a0 100644 --- a/basics/close-account/anchor/programs/close-account/Cargo.toml +++ b/basics/close-account/anchor/programs/close-account/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/close-account/native/program/Cargo.toml b/basics/close-account/native/program/Cargo.toml index 8eae596dc..32489196b 100644 --- a/basics/close-account/native/program/Cargo.toml +++ b/basics/close-account/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/close-account/native/program/src/instructions/create_user.rs b/basics/close-account/native/program/src/instructions/create_user.rs index dc03f53a1..823a9b252 100644 --- a/basics/close-account/native/program/src/instructions/create_user.rs +++ b/basics/close-account/native/program/src/instructions/create_user.rs @@ -17,7 +17,7 @@ pub fn create_user(program_id: &Pubkey, accounts: &[AccountInfo], data: User) -> let payer = next_account_info(accounts_iter)?; let system_program = next_account_info(accounts_iter)?; - let account_span = (data.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&data); let lamports_required = (Rent::get()?).minimum_balance(account_span); let (_, bump) = Pubkey::find_program_address( diff --git a/basics/counter/anchor/programs/counter_anchor/Cargo.toml b/basics/counter/anchor/programs/counter_anchor/Cargo.toml index a69eb2af0..b2bd23b3a 100644 --- a/basics/counter/anchor/programs/counter_anchor/Cargo.toml +++ b/basics/counter/anchor/programs/counter_anchor/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/counter/mpl-stack/Cargo.toml b/basics/counter/mpl-stack/Cargo.toml index 8cbcada4a..021fa4caa 100644 --- a/basics/counter/mpl-stack/Cargo.toml +++ b/basics/counter/mpl-stack/Cargo.toml @@ -12,6 +12,6 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -borsh = "0.9" -shank = "0.0.8" -solana-program = "=1.17.25" +borsh = "1.5.1" +shank = "0.4.2" +solana-program = "=2.0.2" diff --git a/basics/counter/native/program/Cargo.toml b/basics/counter/native/program/Cargo.toml index 56c69b89f..612050fcc 100644 --- a/basics/counter/native/program/Cargo.toml +++ b/basics/counter/native/program/Cargo.toml @@ -12,5 +12,5 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -borsh = "0.9.3" -solana-program = "=1.17.25" +borsh = "1.5.1" +solana-program = "=2.0.2" diff --git a/basics/create-account/anchor/programs/create-system-account/Cargo.toml b/basics/create-account/anchor/programs/create-system-account/Cargo.toml index 2040eb2ea..b5fb22d62 100644 --- a/basics/create-account/anchor/programs/create-system-account/Cargo.toml +++ b/basics/create-account/anchor/programs/create-system-account/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/create-account/native/program/Cargo.toml b/basics/create-account/native/program/Cargo.toml index 62f7cdcf1..3ec7a64a8 100644 --- a/basics/create-account/native/program/Cargo.toml +++ b/basics/create-account/native/program/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -solana-program = "=1.17.25" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/cross-program-invocation/anchor/programs/hand/Cargo.toml b/basics/cross-program-invocation/anchor/programs/hand/Cargo.toml index a5e693e2e..814b4b9d6 100644 --- a/basics/cross-program-invocation/anchor/programs/hand/Cargo.toml +++ b/basics/cross-program-invocation/anchor/programs/hand/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/cross-program-invocation/anchor/programs/lever/Cargo.toml b/basics/cross-program-invocation/anchor/programs/lever/Cargo.toml index cc3e0cc69..2f9b351f7 100644 --- a/basics/cross-program-invocation/anchor/programs/lever/Cargo.toml +++ b/basics/cross-program-invocation/anchor/programs/lever/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/cross-program-invocation/native/programs/hand/Cargo.toml b/basics/cross-program-invocation/native/programs/hand/Cargo.toml index 04e6ec9ae..d70c9f38e 100644 --- a/basics/cross-program-invocation/native/programs/hand/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/hand/Cargo.toml @@ -8,9 +8,9 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = "0.10" -borsh-derive = "0.10" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] } [lib] diff --git a/basics/cross-program-invocation/native/programs/lever/Cargo.toml b/basics/cross-program-invocation/native/programs/lever/Cargo.toml index 46e9f95bf..cbfd83189 100644 --- a/basics/cross-program-invocation/native/programs/lever/Cargo.toml +++ b/basics/cross-program-invocation/native/programs/lever/Cargo.toml @@ -8,9 +8,9 @@ no-entrypoint = [] cpi = ["no-entrypoint"] [dependencies] -borsh = "0.10" -borsh-derive = "0.10" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/cross-program-invocation/native/programs/lever/src/lib.rs b/basics/cross-program-invocation/native/programs/lever/src/lib.rs index 982511548..232c4819d 100644 --- a/basics/cross-program-invocation/native/programs/lever/src/lib.rs +++ b/basics/cross-program-invocation/native/programs/lever/src/lib.rs @@ -42,7 +42,7 @@ pub fn initialize( let user = next_account_info(accounts_iter)?; let system_program = next_account_info(accounts_iter)?; - let account_span = (power_status.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&power_status); let lamports_required = (Rent::get()?).minimum_balance(account_span); invoke( diff --git a/basics/favorites/anchor/programs/favorites/Cargo.toml b/basics/favorites/anchor/programs/favorites/Cargo.toml index 4c1cb893f..d8f4de598 100644 --- a/basics/favorites/anchor/programs/favorites/Cargo.toml +++ b/basics/favorites/anchor/programs/favorites/Cargo.toml @@ -17,5 +17,5 @@ default = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = {version = "0.30.0", features = ["init-if-needed"]} -solana-program = "=1.18.5" +anchor-lang = {version = "0.30.1", features = ["init-if-needed"]} +solana-program = "=2.0.2" diff --git a/basics/hello-solana/anchor/Anchor.toml b/basics/hello-solana/anchor/Anchor.toml index ef9757f65..a21d8ca1b 100644 --- a/basics/hello-solana/anchor/Anchor.toml +++ b/basics/hello-solana/anchor/Anchor.toml @@ -9,7 +9,7 @@ hello_solana = "2phbC62wekpw95XuBk4i1KX4uA8zBUWmYbiTMhicSuBV" url = "https://api.apr.dev" [provider] -cluster = "Localnet" +cluster = "Devnet" wallet = "~/.config/solana/id.json" [scripts] diff --git a/basics/hello-solana/anchor/Cargo.toml b/basics/hello-solana/anchor/Cargo.toml index f39770481..29c7a9a19 100644 --- a/basics/hello-solana/anchor/Cargo.toml +++ b/basics/hello-solana/anchor/Cargo.toml @@ -12,3 +12,4 @@ codegen-units = 1 opt-level = 3 incremental = false codegen-units = 1 + diff --git a/basics/hello-solana/anchor/programs/hello-solana/Cargo.toml b/basics/hello-solana/anchor/programs/hello-solana/Cargo.toml index c690d2155..4857dd51f 100644 --- a/basics/hello-solana/anchor/programs/hello-solana/Cargo.toml +++ b/basics/hello-solana/anchor/programs/hello-solana/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/hello-solana/native/program/Cargo.toml b/basics/hello-solana/native/program/Cargo.toml index b4eea40ae..ced32554d 100644 --- a/basics/hello-solana/native/program/Cargo.toml +++ b/basics/hello-solana/native/program/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -solana-program = "=1.17.25" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/pda-rent-payer/anchor/programs/anchor-program-example/Cargo.toml b/basics/pda-rent-payer/anchor/programs/anchor-program-example/Cargo.toml index 1a7067142..edc3d15ea 100644 --- a/basics/pda-rent-payer/anchor/programs/anchor-program-example/Cargo.toml +++ b/basics/pda-rent-payer/anchor/programs/anchor-program-example/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/pda-rent-payer/native/program/Cargo.toml b/basics/pda-rent-payer/native/program/Cargo.toml index 7ebba4140..03982882e 100644 --- a/basics/pda-rent-payer/native/program/Cargo.toml +++ b/basics/pda-rent-payer/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -solana-program = "=1.17.25" -borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/processing-instructions/anchor/programs/processing-instructions/Cargo.toml b/basics/processing-instructions/anchor/programs/processing-instructions/Cargo.toml index 6a3e766d4..54428f269 100644 --- a/basics/processing-instructions/anchor/programs/processing-instructions/Cargo.toml +++ b/basics/processing-instructions/anchor/programs/processing-instructions/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/processing-instructions/native/program/Cargo.toml b/basics/processing-instructions/native/program/Cargo.toml index b7a4fe0c6..2af07cc7e 100644 --- a/basics/processing-instructions/native/program/Cargo.toml +++ b/basics/processing-instructions/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml b/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml index 47921101c..920219504 100644 --- a/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml +++ b/basics/realloc/anchor/programs/anchor-realloc/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/realloc/native/program/Cargo.toml b/basics/realloc/native/program/Cargo.toml index 494ba61c2..716021cca 100644 --- a/basics/realloc/native/program/Cargo.toml +++ b/basics/realloc/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/realloc/native/program/src/instructions/create.rs b/basics/realloc/native/program/src/instructions/create.rs index 68dd08f08..4ab9ba526 100644 --- a/basics/realloc/native/program/src/instructions/create.rs +++ b/basics/realloc/native/program/src/instructions/create.rs @@ -21,7 +21,7 @@ pub fn create_address_info( let payer = next_account_info(accounts_iter)?; let system_program = next_account_info(accounts_iter)?; - let account_span = (data.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&data); let lamports_required = (Rent::get()?).minimum_balance(account_span); invoke( diff --git a/basics/realloc/native/program/src/instructions/reallocate.rs b/basics/realloc/native/program/src/instructions/reallocate.rs index c2bdfbace..1e2888aa9 100644 --- a/basics/realloc/native/program/src/instructions/reallocate.rs +++ b/basics/realloc/native/program/src/instructions/reallocate.rs @@ -23,7 +23,7 @@ pub fn reallocate_without_zero_init( let enhanced_address_info_data = EnhancedAddressInfo::from_address_info(address_info_data, args.state, args.zip); - let account_span = (enhanced_address_info_data.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&enhanced_address_info_data); let lamports_required = (Rent::get()?).minimum_balance(account_span); let diff = lamports_required - target_account.lamports(); @@ -47,7 +47,7 @@ pub fn reallocate_zero_init(accounts: &[AccountInfo], data: WorkInfo) -> Program let accounts_iter = &mut accounts.iter(); let target_account = next_account_info(accounts_iter)?; - let account_span = (data.try_to_vec()?).len(); + let account_span = std::mem::size_of_val(&data); target_account.realloc(account_span, true)?; diff --git a/basics/rent/anchor/programs/rent-example/Cargo.toml b/basics/rent/anchor/programs/rent-example/Cargo.toml index 12370fc50..7bba57250 100644 --- a/basics/rent/anchor/programs/rent-example/Cargo.toml +++ b/basics/rent/anchor/programs/rent-example/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/rent/native/program/Cargo.toml b/basics/rent/native/program/Cargo.toml index 7baad78d0..f3e6e7397 100644 --- a/basics/rent/native/program/Cargo.toml +++ b/basics/rent/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/repository-layout/anchor/programs/carnival/Cargo.toml b/basics/repository-layout/anchor/programs/carnival/Cargo.toml index 579fc1700..e011f5ccc 100644 --- a/basics/repository-layout/anchor/programs/carnival/Cargo.toml +++ b/basics/repository-layout/anchor/programs/carnival/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/repository-layout/native/program/Cargo.toml b/basics/repository-layout/native/program/Cargo.toml index be1031246..5d2ba38f8 100644 --- a/basics/repository-layout/native/program/Cargo.toml +++ b/basics/repository-layout/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/transfer-sol/anchor/programs/transfer-sol/Cargo.toml b/basics/transfer-sol/anchor/programs/transfer-sol/Cargo.toml index f50e0dd5a..df8ace26a 100644 --- a/basics/transfer-sol/anchor/programs/transfer-sol/Cargo.toml +++ b/basics/transfer-sol/anchor/programs/transfer-sol/Cargo.toml @@ -17,4 +17,4 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" +anchor-lang = "0.30.1" diff --git a/basics/transfer-sol/native/program/Cargo.toml b/basics/transfer-sol/native/program/Cargo.toml index af3ec85fd..083cf5d7d 100644 --- a/basics/transfer-sol/native/program/Cargo.toml +++ b/basics/transfer-sol/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" [lib] crate-type = ["cdylib", "lib"] diff --git a/compression/cnft-burn/anchor/programs/cnft-burn/Cargo.toml b/compression/cnft-burn/anchor/programs/cnft-burn/Cargo.toml index da383f96e..06f9e113d 100644 --- a/compression/cnft-burn/anchor/programs/cnft-burn/Cargo.toml +++ b/compression/cnft-burn/anchor/programs/cnft-burn/Cargo.toml @@ -17,7 +17,7 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build"] [dependencies] -anchor-lang = "0.30.0" -mpl-bubblegum = "1.3.0" +anchor-lang = "0.30.1" +mpl-bubblegum = "1.4.0" spl-account-compression = { version="0.3.0",features = ["no-entrypoint","cpi"] } -ahash = "=0.8.7" +ahash = "=0.8.11" diff --git a/compression/cnft-vault/anchor/programs/cnft-vault/Cargo.toml b/compression/cnft-vault/anchor/programs/cnft-vault/Cargo.toml index 6a8b5211c..cd58fe9f2 100644 --- a/compression/cnft-vault/anchor/programs/cnft-vault/Cargo.toml +++ b/compression/cnft-vault/anchor/programs/cnft-vault/Cargo.toml @@ -16,7 +16,7 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = "0.26.0" -solana-program = "1.14" +anchor-lang = "0.30.1" +solana-program = "=2.0.2" spl-account-compression = { version="0.1.8", features = ["cpi"] } mpl-bubblegum = { version = "0.7.0", features = ["no-entrypoint", "cpi"] } \ No newline at end of file diff --git a/compression/cutils/anchor/programs/cutils/Cargo.toml b/compression/cutils/anchor/programs/cutils/Cargo.toml index 59de93b61..2f120433e 100644 --- a/compression/cutils/anchor/programs/cutils/Cargo.toml +++ b/compression/cutils/anchor/programs/cutils/Cargo.toml @@ -16,8 +16,8 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = "0.26.0" -solana-program = "1.14.18" +anchor-lang = "0.30.1" +solana-program = "2.0.2" spl-account-compression = { version="0.1.8", features = ["cpi"] } mpl-bubblegum = { version = "0.7.0", features = ["no-entrypoint", "cpi"] } diff --git a/oracles/pyth/anchor/programs/pythexample/Cargo.toml b/oracles/pyth/anchor/programs/pythexample/Cargo.toml index d9d931c8d..7e887275c 100644 --- a/oracles/pyth/anchor/programs/pythexample/Cargo.toml +++ b/oracles/pyth/anchor/programs/pythexample/Cargo.toml @@ -16,6 +16,6 @@ no-idl = [] no-log-ix-name = [] [dependencies] -anchor-lang = "0.28.0" -pyth-sdk-solana = "0.8.0" +anchor-lang = "0.30.1" +pyth-sdk-solana = "0.10.1" pyth-sdk = "0.8.0" diff --git a/package.json b/package.json index 5931c244b..875271498 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,9 @@ "prepare": "husky" }, "lint-staged": { - "*": ["biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true"] + "*": [ + "biome check --apply --no-errors-on-unmatched --files-ignore-unknown=true" + ] }, "keywords": [], "author": "Solana Foundation", @@ -24,5 +26,8 @@ "picocolors": "^1.0.0", "ts-node": "^10.9.1", "typescript": "^5.2.2" + }, + "dependencies": { + "package.json": "^2.0.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 656fd0678..c70cacc92 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,275 +1,765 @@ -lockfileVersion: '9.0' +lockfileVersion: '6.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -importers: - - .: - devDependencies: - '@biomejs/biome': - specifier: 1.8.1 - version: 1.8.1 - '@types/node': - specifier: ^20.9.0 - version: 20.14.2 - husky: - specifier: ^9.0.11 - version: 9.0.11 - picocolors: - specifier: ^1.0.0 - version: 1.0.1 - ts-node: - specifier: ^10.9.1 - version: 10.9.2(@types/node@20.14.2)(typescript@5.4.5) - typescript: - specifier: ^5.2.2 - version: 5.4.5 +dependencies: + package.json: + specifier: ^2.0.1 + version: 2.0.1 + +devDependencies: + '@biomejs/biome': + specifier: 1.8.1 + version: 1.8.1 + '@types/node': + specifier: ^20.9.0 + version: 20.14.10 + husky: + specifier: ^9.0.11 + version: 9.0.11 + picocolors: + specifier: ^1.0.0 + version: 1.0.1 + ts-node: + specifier: ^10.9.1 + version: 10.9.2(@types/node@20.14.10)(typescript@5.5.3) + typescript: + specifier: ^5.2.2 + version: 5.5.3 packages: - '@biomejs/biome@1.8.1': + /@biomejs/biome@1.8.1: resolution: {integrity: sha512-fQXGfvq6DIXem12dGQCM2tNF+vsNHH1qs3C7WeOu75Pd0trduoTmoO7G4ntLJ2qDs5wuw981H+cxQhi1uHnAtA==} engines: {node: '>=14.21.3'} hasBin: true + requiresBuild: true + optionalDependencies: + '@biomejs/cli-darwin-arm64': 1.8.1 + '@biomejs/cli-darwin-x64': 1.8.1 + '@biomejs/cli-linux-arm64': 1.8.1 + '@biomejs/cli-linux-arm64-musl': 1.8.1 + '@biomejs/cli-linux-x64': 1.8.1 + '@biomejs/cli-linux-x64-musl': 1.8.1 + '@biomejs/cli-win32-arm64': 1.8.1 + '@biomejs/cli-win32-x64': 1.8.1 + dev: true - '@biomejs/cli-darwin-arm64@1.8.1': + /@biomejs/cli-darwin-arm64@1.8.1: resolution: {integrity: sha512-XLiB7Uu6GALIOBWzQ2aMD0ru4Ly5/qSeQF7kk3AabzJ/kwsEWSe33iVySBP/SS2qv25cgqNiLksjGcw2bHT3mw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-darwin-x64@1.8.1': + /@biomejs/cli-darwin-x64@1.8.1: resolution: {integrity: sha512-uMTSxVLMfqkBVqyc25hSn83jBbp+wtWjzM/pHFlKXt3htJuw7FErVGW0nmQ9Sxa9vJ7GcqoltLMl28VQRIMYzg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-linux-arm64-musl@1.8.1': + /@biomejs/cli-linux-arm64-musl@1.8.1: resolution: {integrity: sha512-UQ8Wc01J0wQL+5AYOc7qkJn20B4PZmQL1KrmDZh7ot0DvD6aX4+8mmfd/dG5b6Zjo/44QvCKcvkFGCMRYuhWZA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-linux-arm64@1.8.1': + /@biomejs/cli-linux-arm64@1.8.1: resolution: {integrity: sha512-3SzZRuC/9Oi2P2IBNPsEj0KXxSXUEYRR2kfRF/Ve8QAfGgrt4qnwuWd6QQKKN5R+oYH691qjm+cXBKEcrP1v/Q==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-linux-x64-musl@1.8.1': + /@biomejs/cli-linux-x64-musl@1.8.1: resolution: {integrity: sha512-fYbP/kNu/rtZ4kKzWVocIdqZOtBSUEg9qUhZaao3dy3CRzafR6u6KDtBeSCnt47O+iLnks1eOR1TUxzr5+QuqA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-linux-x64@1.8.1': + /@biomejs/cli-linux-x64@1.8.1: resolution: {integrity: sha512-AeBycVdNrTzsyYKEOtR2R0Ph0hCD0sCshcp2aOnfGP0hCZbtFg09D0SdKLbyzKntisY41HxKVrydYiaApp+2uw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-win32-arm64@1.8.1': + /@biomejs/cli-win32-arm64@1.8.1: resolution: {integrity: sha512-6tEd1H/iFKpgpE3OIB7oNgW5XkjiVMzMRPL8zYoZ036YfuJ5nMYm9eB9H/y81+8Z76vL48fiYzMPotJwukGPqQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] + requiresBuild: true + dev: true + optional: true - '@biomejs/cli-win32-x64@1.8.1': + /@biomejs/cli-win32-x64@1.8.1: resolution: {integrity: sha512-g2H31jJzYmS4jkvl6TiyEjEX+Nv79a5km/xn+5DARTp5MBFzC9gwceusSSB2AkJKqZzY131AiACAWjKrVt5Ijw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] + requiresBuild: true + dev: true + optional: true - '@cspotcode/source-map-support@0.8.1': + /@cspotcode/source-map-support@0.8.1: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} + dependencies: + '@jridgewell/trace-mapping': 0.3.9 + dev: true - '@jridgewell/resolve-uri@3.1.2': + /@jridgewell/resolve-uri@3.1.2: resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} + dev: true - '@jridgewell/sourcemap-codec@1.4.15': - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + /@jridgewell/sourcemap-codec@1.5.0: + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + dev: true - '@jridgewell/trace-mapping@0.3.9': + /@jridgewell/trace-mapping@0.3.9: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.0 + dev: true - '@tsconfig/node10@1.0.11': + /@tsconfig/node10@1.0.11: resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==} + dev: true - '@tsconfig/node12@1.0.11': + /@tsconfig/node12@1.0.11: resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} + dev: true - '@tsconfig/node14@1.0.3': + /@tsconfig/node14@1.0.3: resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} + dev: true - '@tsconfig/node16@1.0.4': + /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} + dev: true - '@types/node@20.14.2': - resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==} + /@types/keyv@3.1.4: + resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} + dependencies: + '@types/node': 20.14.10 + dev: false - acorn-walk@8.3.2: - resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} + /@types/node@20.14.10: + resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + dependencies: + undici-types: 5.26.5 + + /@types/responselike@1.0.3: + resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} + dependencies: + '@types/node': 20.14.10 + dev: false + + /abs@1.3.14: + resolution: {integrity: sha512-PrS26IzwKLWwuURpiKl8wRmJ2KdR/azaVrLEBWG/TALwT20Y7qjtYp1qcMLHA4206hBHY5phv3w4pjf9NPv4Vw==} + dependencies: + ul: 5.2.15 + dev: false + + /acorn-walk@8.3.3: + resolution: {integrity: sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==} engines: {node: '>=0.4.0'} + dependencies: + acorn: 8.12.1 + dev: true - acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + /acorn@8.12.1: + resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} hasBin: true + dev: true - arg@4.1.3: + /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} + dev: true + + /capture-stack-trace@1.0.2: + resolution: {integrity: sha512-X/WM2UQs6VMHUtjUDnZTRI+i1crWteJySFzr9UpGoQa4WQffXVTTXuekjl7TjZRlcF2XfjgITT0HxZ9RnxeT0w==} + engines: {node: '>=0.10.0'} + dev: false - create-require@1.1.1: + /core-util-is@1.0.3: + resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + dev: false + + /create-error-class@3.0.2: + resolution: {integrity: sha512-gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==} + engines: {node: '>=0.10.0'} + dependencies: + capture-stack-trace: 1.0.2 + dev: false + + /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} + dev: true + + /deep-extend@0.6.0: + resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} + engines: {node: '>=4.0.0'} + dev: false - diff@4.0.2: + /deffy@2.2.4: + resolution: {integrity: sha512-pLc9lsbsWjr6RxmJ2OLyvm+9l4j1yK69h+TML/gUit/t3vTijpkNGh8LioaJYTGO7F25m6HZndADcUOo2PsiUg==} + dependencies: + typpy: 2.3.13 + dev: false + + /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} + dev: true + + /duplexer2@0.1.4: + resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==} + dependencies: + readable-stream: 2.3.8 + dev: false + + /err@1.1.1: + resolution: {integrity: sha512-N97Ybd2jJHVQ+Ft3Q5+C2gM3kgygkdeQmEqbN2z15UTVyyEsIwLA1VK39O1DHEJhXbwIFcJLqm6iARNhFANcQA==} + dependencies: + typpy: 2.3.13 + dev: false + + /error-ex@1.3.2: + resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + dependencies: + is-arrayish: 0.2.1 + dev: false - husky@9.0.11: + /exec-limiter@3.2.13: + resolution: {integrity: sha512-86Ri699bwiHZVBzTzNj8gspqAhCPchg70zPVWIh3qzUOA1pUMcb272Em3LPk8AE0mS95B9yMJhtqF8vFJAn0dA==} + dependencies: + limit-it: 3.2.10 + typpy: 2.3.13 + dev: false + + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + dev: false + + /function.name@1.0.13: + resolution: {integrity: sha512-mVrqdoy5npWZyoXl4DxCeuVF6delDcQjVS9aPdvLYlBxtMTZDR2B5GVEQEoM1jJyspCqg3C0v4ABkLE7tp9xFA==} + dependencies: + noop6: 1.0.9 + dev: false + + /git-package-json@1.4.10: + resolution: {integrity: sha512-DRAcvbzd2SxGK7w8OgYfvKqhFliT5keX0lmSmVdgScgf1kkl5tbbo7Pam6uYoCa1liOiipKxQZG8quCtGWl/fA==} + dependencies: + deffy: 2.2.4 + err: 1.1.1 + gry: 5.0.8 + normalize-package-data: 2.5.0 + oargv: 3.4.10 + one-by-one: 3.2.8 + r-json: 1.3.0 + r-package-json: 1.0.9 + tmp: 0.0.28 + dev: false + + /git-source@1.1.10: + resolution: {integrity: sha512-XZZ7ZgnLL35oLgM/xjnLYgtlKlxJG0FohC1kWDvGkU7s1VKGXK0pFF/g1itQEwQ3D+uTQzBnzPi8XbqOv7Wc1Q==} + dependencies: + git-url-parse: 5.0.1 + dev: false + + /git-up@1.2.1: + resolution: {integrity: sha512-SRVN3rOLACva8imc7BFrB6ts5iISWKH1/h/1Z+JZYoUI7UVQM7gQqk4M2yxUENbq2jUUT09NEND5xwP1i7Ktlw==} + dependencies: + is-ssh: 1.4.0 + parse-url: 1.3.11 + dev: false + + /git-url-parse@5.0.1: + resolution: {integrity: sha512-4uSiOgrryNEMBX+gTWogenYRUh2j1D+95STTSEF2RCTgLkfJikl8c7BGr0Bn274hwuxTsbS2/FQ5pVS9FoXegQ==} + dependencies: + git-up: 1.2.1 + dev: false + + /got@5.7.1: + resolution: {integrity: sha512-1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==} + engines: {node: '>=0.10.0 <7'} + dependencies: + '@types/keyv': 3.1.4 + '@types/responselike': 1.0.3 + create-error-class: 3.0.2 + duplexer2: 0.1.4 + is-redirect: 1.0.0 + is-retry-allowed: 1.2.0 + is-stream: 1.1.0 + lowercase-keys: 1.0.1 + node-status-codes: 1.0.0 + object-assign: 4.1.1 + parse-json: 2.2.0 + pinkie-promise: 2.0.1 + read-all-stream: 3.1.0 + readable-stream: 2.3.8 + timed-out: 3.1.3 + unzip-response: 1.0.2 + url-parse-lax: 1.0.0 + dev: false + + /gry@5.0.8: + resolution: {integrity: sha512-meq9ZjYVpLzZh3ojhTg7IMad9grGsx6rUUKHLqPnhLXzJkRQvEL2U3tQpS5/WentYTtHtxkT3Ew/mb10D6F6/g==} + dependencies: + abs: 1.3.14 + exec-limiter: 3.2.13 + one-by-one: 3.2.8 + ul: 5.2.15 + dev: false + + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 + dev: false + + /hosted-git-info@2.8.9: + resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} + dev: false + + /husky@9.0.11: resolution: {integrity: sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==} engines: {node: '>=18'} hasBin: true + dev: true - make-error@1.3.6: - resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + /inherits@2.0.4: + resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + dev: false - picocolors@1.0.1: - resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + /ini@1.3.8: + resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} + dev: false - ts-node@10.9.2: - resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} - hasBin: true - peerDependencies: - '@swc/core': '>=1.2.50' - '@swc/wasm': '>=1.2.50' - '@types/node': '*' - typescript: '>=2.7' - peerDependenciesMeta: - '@swc/core': - optional: true - '@swc/wasm': - optional: true + /is-arrayish@0.2.1: + resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + dev: false - typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} - engines: {node: '>=14.17'} - hasBin: true + /is-core-module@2.14.0: + resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==} + engines: {node: '>= 0.4'} + dependencies: + hasown: 2.0.2 + dev: false - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + /is-redirect@1.0.0: + resolution: {integrity: sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==} + engines: {node: '>=0.10.0'} + dev: false - v8-compile-cache-lib@3.0.1: - resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + /is-retry-allowed@1.2.0: + resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==} + engines: {node: '>=0.10.0'} + dev: false - yn@3.1.1: - resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} - engines: {node: '>=6'} + /is-ssh@1.4.0: + resolution: {integrity: sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==} + dependencies: + protocols: 2.0.1 + dev: false -snapshots: + /is-stream@1.1.0: + resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==} + engines: {node: '>=0.10.0'} + dev: false - '@biomejs/biome@1.8.1': - optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.8.1 - '@biomejs/cli-darwin-x64': 1.8.1 - '@biomejs/cli-linux-arm64': 1.8.1 - '@biomejs/cli-linux-arm64-musl': 1.8.1 - '@biomejs/cli-linux-x64': 1.8.1 - '@biomejs/cli-linux-x64-musl': 1.8.1 - '@biomejs/cli-win32-arm64': 1.8.1 - '@biomejs/cli-win32-x64': 1.8.1 + /isarray@1.0.0: + resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} + dev: false - '@biomejs/cli-darwin-arm64@1.8.1': - optional: true + /iterate-object@1.3.4: + resolution: {integrity: sha512-4dG1D1x/7g8PwHS9aK6QV5V94+ZvyP4+d19qDv43EzImmrndysIl4prmJ1hWWIGCqrZHyaHBm6BSEWHOLnpoNw==} + dev: false - '@biomejs/cli-darwin-x64@1.8.1': - optional: true + /limit-it@3.2.10: + resolution: {integrity: sha512-T0NK99pHnkimldr1WUqvbGV1oWDku/xC9J/OqzJFsV1jeOS6Bwl8W7vkeQIBqwiON9dTALws+rX/XPMQqWerDQ==} + dependencies: + typpy: 2.3.13 + dev: false - '@biomejs/cli-linux-arm64-musl@1.8.1': - optional: true + /lowercase-keys@1.0.1: + resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==} + engines: {node: '>=0.10.0'} + dev: false - '@biomejs/cli-linux-arm64@1.8.1': - optional: true + /make-error@1.3.6: + resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + dev: true - '@biomejs/cli-linux-x64-musl@1.8.1': - optional: true + /minimist@1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + dev: false - '@biomejs/cli-linux-x64@1.8.1': - optional: true + /node-status-codes@1.0.0: + resolution: {integrity: sha512-1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==} + engines: {node: '>=0.10.0'} + dev: false - '@biomejs/cli-win32-arm64@1.8.1': - optional: true + /noop6@1.0.9: + resolution: {integrity: sha512-DB3Hwyd89dPr5HqEPg3YHjzvwh/mCqizC1zZ8vyofqc+TQRyPDnT4wgXXbLGF4z9YAzwwTLi8pNLhGqcbSjgkA==} + dev: false - '@biomejs/cli-win32-x64@1.8.1': - optional: true + /normalize-package-data@2.5.0: + resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} + dependencies: + hosted-git-info: 2.8.9 + resolve: 1.22.8 + semver: 5.7.2 + validate-npm-package-license: 3.0.4 + dev: false + + /oargv@3.4.10: + resolution: {integrity: sha512-SXaMANv9sr7S/dP0vj0+Ybipa47UE1ntTWQ2rpPRhC6Bsvfl+Jg03Xif7jfL0sWKOYWK8oPjcZ5eJ82t8AP/8g==} + dependencies: + iterate-object: 1.3.4 + ul: 5.2.15 + dev: false - '@cspotcode/source-map-support@0.8.1': + /obj-def@1.0.9: + resolution: {integrity: sha512-bQ4ya3VYD6FAA1+s6mEhaURRHSmw4+sKaXE6UyXZ1XDYc5D+c7look25dFdydmLd18epUegh398gdDkMUZI9xg==} dependencies: - '@jridgewell/trace-mapping': 0.3.9 + deffy: 2.2.4 + dev: false - '@jridgewell/resolve-uri@3.1.2': {} + /object-assign@4.1.1: + resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} + engines: {node: '>=0.10.0'} + dev: false - '@jridgewell/sourcemap-codec@1.4.15': {} + /one-by-one@3.2.8: + resolution: {integrity: sha512-HR/pSzZdm46Xqj58K+Bu64kMbSTw8/u77AwWvV+rprO/OsuR++pPlkUJn+SmwqBGRgHKwSKQ974V3uls7crIeQ==} + dependencies: + obj-def: 1.0.9 + sliced: 1.0.1 + dev: false - '@jridgewell/trace-mapping@0.3.9': + /os-tmpdir@1.0.2: + resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} + engines: {node: '>=0.10.0'} + dev: false + + /package-json-path@1.0.9: + resolution: {integrity: sha512-uNu7f6Ef7tQHZRnkyVnCtzdSYVN9uBtge/sG7wzcUaawFWkPYUq67iXxRGrQSg/q0tzxIB8jSyIYUKjG2Jn//A==} dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 + abs: 1.3.14 + dev: false - '@tsconfig/node10@1.0.11': {} + /package-json@2.4.0: + resolution: {integrity: sha512-PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==} + engines: {node: '>=0.10.0'} + dependencies: + got: 5.7.1 + registry-auth-token: 3.4.0 + registry-url: 3.1.0 + semver: 5.7.2 + dev: false + + /package.json@2.0.1: + resolution: {integrity: sha512-pSxZ6XR5yEawRN2ekxx9IKgPN5uNAYco7MCPxtBEWMKO3UKWa1X2CtQMzMgloeGj2g2o6cue3Sb5iPkByIJqlw==} + deprecated: Use pkg.json instead. + dependencies: + git-package-json: 1.4.10 + git-source: 1.1.10 + package-json: 2.4.0 + dev: false + + /parse-json@2.2.0: + resolution: {integrity: sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==} + engines: {node: '>=0.10.0'} + dependencies: + error-ex: 1.3.2 + dev: false - '@tsconfig/node12@1.0.11': {} + /parse-url@1.3.11: + resolution: {integrity: sha512-1wj9nkgH/5EboDxLwaTMGJh3oH3f+Gue+aGdh631oCqoSBpokzmMmOldvOeBPtB8GJBYJbaF93KPzlkU+Y1ksg==} + dependencies: + is-ssh: 1.4.0 + protocols: 1.4.8 + dev: false - '@tsconfig/node14@1.0.3': {} + /path-parse@1.0.7: + resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + dev: false - '@tsconfig/node16@1.0.4': {} + /picocolors@1.0.1: + resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + dev: true - '@types/node@20.14.2': + /pinkie-promise@2.0.1: + resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==} + engines: {node: '>=0.10.0'} dependencies: - undici-types: 5.26.5 + pinkie: 2.0.4 + dev: false - acorn-walk@8.3.2: {} + /pinkie@2.0.4: + resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==} + engines: {node: '>=0.10.0'} + dev: false - acorn@8.11.3: {} + /prepend-http@1.0.4: + resolution: {integrity: sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==} + engines: {node: '>=0.10.0'} + dev: false - arg@4.1.3: {} + /process-nextick-args@2.0.1: + resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + dev: false - create-require@1.1.1: {} + /protocols@1.4.8: + resolution: {integrity: sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==} + dev: false - diff@4.0.2: {} + /protocols@2.0.1: + resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==} + dev: false - husky@9.0.11: {} + /r-json@1.3.0: + resolution: {integrity: sha512-xesd+RHCpymPCYd9DvDvUr1w1IieSChkqYF1EpuAYrvCfLXji9NP36DvyYZJZZB5soVDvZ0WUtBoZaU1g5Yt9A==} + dependencies: + w-json: 1.3.10 + dev: false - make-error@1.3.6: {} + /r-package-json@1.0.9: + resolution: {integrity: sha512-G4Vpf1KImWmmPFGdtWQTU0L9zk0SjqEC4qs/jE7AQ+Ylmr5kizMzGeC4wnHp5+ijPqNN+2ZPpvyjVNdN1CDVcg==} + dependencies: + package-json-path: 1.0.9 + r-json: 1.3.0 + dev: false - picocolors@1.0.1: {} + /rc@1.2.8: + resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} + hasBin: true + dependencies: + deep-extend: 0.6.0 + ini: 1.3.8 + minimist: 1.2.8 + strip-json-comments: 2.0.1 + dev: false + + /read-all-stream@3.1.0: + resolution: {integrity: sha512-DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==} + engines: {node: '>=0.10.0'} + dependencies: + pinkie-promise: 2.0.1 + readable-stream: 2.3.8 + dev: false - ts-node@10.9.2(@types/node@20.14.2)(typescript@5.4.5): + /readable-stream@2.3.8: + resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} + dependencies: + core-util-is: 1.0.3 + inherits: 2.0.4 + isarray: 1.0.0 + process-nextick-args: 2.0.1 + safe-buffer: 5.1.2 + string_decoder: 1.1.1 + util-deprecate: 1.0.2 + dev: false + + /registry-auth-token@3.4.0: + resolution: {integrity: sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==} + dependencies: + rc: 1.2.8 + safe-buffer: 5.2.1 + dev: false + + /registry-url@3.1.0: + resolution: {integrity: sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==} + engines: {node: '>=0.10.0'} + dependencies: + rc: 1.2.8 + dev: false + + /resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + hasBin: true + dependencies: + is-core-module: 2.14.0 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + dev: false + + /safe-buffer@5.1.2: + resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} + dev: false + + /safe-buffer@5.2.1: + resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + dev: false + + /semver@5.7.2: + resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} + hasBin: true + dev: false + + /sliced@1.0.1: + resolution: {integrity: sha512-VZBmZP8WU3sMOZm1bdgTadsQbcscK0UM8oKxKVBs4XAhUo2Xxzm/OFMGBkPusxw9xL3Uy8LrzEqGqJhclsr0yA==} + dev: false + + /spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + dependencies: + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.18 + dev: false + + /spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + dev: false + + /spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + dependencies: + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.18 + dev: false + + /spdx-license-ids@3.0.18: + resolution: {integrity: sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==} + dev: false + + /string_decoder@1.1.1: + resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} + dependencies: + safe-buffer: 5.1.2 + dev: false + + /strip-json-comments@2.0.1: + resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} + engines: {node: '>=0.10.0'} + dev: false + + /supports-preserve-symlinks-flag@1.0.0: + resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} + engines: {node: '>= 0.4'} + dev: false + + /timed-out@3.1.3: + resolution: {integrity: sha512-3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==} + engines: {node: '>=0.10.0'} + dev: false + + /tmp@0.0.28: + resolution: {integrity: sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==} + engines: {node: '>=0.4.0'} + dependencies: + os-tmpdir: 1.0.2 + dev: false + + /ts-node@10.9.2(@types/node@20.14.10)(typescript@5.5.3): + resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.14.2 - acorn: 8.11.3 - acorn-walk: 8.3.2 + '@types/node': 20.14.10 + acorn: 8.12.1 + acorn-walk: 8.3.3 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.4.5 + typescript: 5.5.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: true - typescript@5.4.5: {} + /typescript@5.5.3: + resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + engines: {node: '>=14.17'} + hasBin: true + dev: true - undici-types@5.26.5: {} + /typpy@2.3.13: + resolution: {integrity: sha512-vOxIcQz9sxHi+rT09SJ5aDgVgrPppQjwnnayTrMye1ODaU8gIZTDM19t9TxmEElbMihx2Nq/0/b/MtyKfayRqA==} + dependencies: + function.name: 1.0.13 + dev: false + + /ul@5.2.15: + resolution: {integrity: sha512-svLEUy8xSCip5IWnsRa0UOg+2zP0Wsj4qlbjTmX6GJSmvKMHADBuHOm1dpNkWqWPIGuVSqzUkV3Cris5JrlTRQ==} + dependencies: + deffy: 2.2.4 + typpy: 2.3.13 + dev: false + + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - v8-compile-cache-lib@3.0.1: {} + /unzip-response@1.0.2: + resolution: {integrity: sha512-pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==} + engines: {node: '>=0.10'} + dev: false - yn@3.1.1: {} + /url-parse-lax@1.0.0: + resolution: {integrity: sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==} + engines: {node: '>=0.10.0'} + dependencies: + prepend-http: 1.0.4 + dev: false + + /util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + dev: false + + /v8-compile-cache-lib@3.0.1: + resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + dev: true + + /validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + dependencies: + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 + dev: false + + /w-json@1.3.10: + resolution: {integrity: sha512-XadVyw0xE+oZ5FGApXsdswv96rOhStzKqL53uSe5UaTadABGkWIg1+DTx8kiZ/VqTZTBneoL0l65RcPe4W3ecw==} + dev: false + + /yn@3.1.1: + resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} + engines: {node: '>=6'} + dev: true diff --git a/tokens/create-token/anchor/programs/create-token/Cargo.toml b/tokens/create-token/anchor/programs/create-token/Cargo.toml index 92948061e..abe8d6c84 100644 --- a/tokens/create-token/anchor/programs/create-token/Cargo.toml +++ b/tokens/create-token/anchor/programs/create-token/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = { version = "0.30.0", features = ["metadata"] } +anchor-lang = "0.30.1" +anchor-spl = { version = "0.30.1", features = ["metadata"] } diff --git a/tokens/create-token/native/program/Cargo.toml b/tokens/create-token/native/program/Cargo.toml index 91e2212a8..987c0d736 100644 --- a/tokens/create-token/native/program/Cargo.toml +++ b/tokens/create-token/native/program/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "2.0.2" spl-token = { version = "4.0.0", features = [ "no-entrypoint" ] } -spl-associated-token-account = { version = "2.0.0", features = [ "no-entrypoint" ] } -mpl-token-metadata = { version = "1.11", features = [ "no-entrypoint" ] } +spl-associated-token-account = { version = "4.0.0", features = [ "no-entrypoint" ] } +mpl-token-metadata = { version = "4.1.2", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/create-token/native/program/src/lib.rs b/tokens/create-token/native/program/src/lib.rs index e7788f431..59d37ab11 100644 --- a/tokens/create-token/native/program/src/lib.rs +++ b/tokens/create-token/native/program/src/lib.rs @@ -1,4 +1,4 @@ -use { + use { borsh::{BorshDeserialize, BorshSerialize}, mpl_token_metadata::instruction as mpl_instruction, solana_program::{ diff --git a/tokens/escrow/anchor/programs/escrow/Cargo.toml b/tokens/escrow/anchor/programs/escrow/Cargo.toml index da676058b..25196b48c 100644 --- a/tokens/escrow/anchor/programs/escrow/Cargo.toml +++ b/tokens/escrow/anchor/programs/escrow/Cargo.toml @@ -17,6 +17,6 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"]} -anchor-spl = "0.30.0" -solana-program = "=1.18.5" +anchor-lang = { version = "0.30.1", features = ["init-if-needed"]} +anchor-spl = "0.30.1" +solana-program = "=2.0.2" diff --git a/tokens/nft-minter/anchor/programs/nft-minter/Cargo.toml b/tokens/nft-minter/anchor/programs/nft-minter/Cargo.toml index abfde7479..eaaea92e7 100644 --- a/tokens/nft-minter/anchor/programs/nft-minter/Cargo.toml +++ b/tokens/nft-minter/anchor/programs/nft-minter/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"] } -anchor-spl = { version = "0.30.0", features = ["metadata"] } +anchor-lang = { version = "0.30.1", features = ["init-if-needed"] } +anchor-spl = { version = "0.30.1", features = ["metadata"] } diff --git a/tokens/nft-minter/native/program/Cargo.toml b/tokens/nft-minter/native/program/Cargo.toml index 551217948..b74d6e109 100644 --- a/tokens/nft-minter/native/program/Cargo.toml +++ b/tokens/nft-minter/native/program/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" -spl-token = { version="4.0.0", features = [ "no-entrypoint" ] } -spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -mpl-token-metadata = { version="1.11" } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "2.0.2" +spl-token = { version="6.0.0", features = [ "no-entrypoint" ] } +spl-associated-token-account = { version="4.0.0", features = [ "no-entrypoint" ] } +mpl-token-metadata = { version="4.1.2" } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/pda-mint-authority/anchor/programs/token-minter/Cargo.toml b/tokens/pda-mint-authority/anchor/programs/token-minter/Cargo.toml index b00b32a99..0bdb79966 100644 --- a/tokens/pda-mint-authority/anchor/programs/token-minter/Cargo.toml +++ b/tokens/pda-mint-authority/anchor/programs/token-minter/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"] } -anchor-spl = { version = "0.30.0", features = ["metadata"] } +anchor-lang = { version = "0.30.1", features = ["init-if-needed"] } +anchor-spl = { version = "0.30.1", features = ["metadata"] } diff --git a/tokens/pda-mint-authority/native/program/Cargo.toml b/tokens/pda-mint-authority/native/program/Cargo.toml index 751bf055a..958139ac7 100644 --- a/tokens/pda-mint-authority/native/program/Cargo.toml +++ b/tokens/pda-mint-authority/native/program/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" -spl-token = { version="4.0.0", features = [ "no-entrypoint" ] } -spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -mpl-token-metadata = { version="1.11", features = [ "no-entrypoint" ] } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "2.0.2" +spl-token = { version="6.0.0", features = [ "no-entrypoint" ] } +spl-associated-token-account = { version="4.0.0", features = [ "no-entrypoint" ] } +mpl-token-metadata = { version="4.1.2", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/spl-token-minter/anchor/programs/spl-token-minter/Cargo.toml b/tokens/spl-token-minter/anchor/programs/spl-token-minter/Cargo.toml index 6e44520f7..3f56bb934 100644 --- a/tokens/spl-token-minter/anchor/programs/spl-token-minter/Cargo.toml +++ b/tokens/spl-token-minter/anchor/programs/spl-token-minter/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"] } -anchor-spl = { version = "0.30.0", features = ["metadata"] } +anchor-lang = { version = "0.30.1", features = ["init-if-needed"] } +anchor-spl = { version = "0.30.1", features = ["metadata"] } diff --git a/tokens/spl-token-minter/native/program/Cargo.toml b/tokens/spl-token-minter/native/program/Cargo.toml index 99d312064..a887b126f 100644 --- a/tokens/spl-token-minter/native/program/Cargo.toml +++ b/tokens/spl-token-minter/native/program/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" -spl-token = { version="4.0.0", features = [ "no-entrypoint" ] } -spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -mpl-token-metadata = { version="1.11", features = [ "no-entrypoint" ] } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "2.0.2" +spl-token = { version="6.0.0", features = [ "no-entrypoint" ] } +spl-associated-token-account = { version="4.0.0", features = [ "no-entrypoint" ] } +mpl-token-metadata = { version="4.1.2", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/basics/anchor/programs/basics/Cargo.toml b/tokens/token-2022/basics/anchor/programs/basics/Cargo.toml index 3d6b36195..703b45701 100644 --- a/tokens/token-2022/basics/anchor/programs/basics/Cargo.toml +++ b/tokens/token-2022/basics/anchor/programs/basics/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-spl = "0.30.0" -anchor-lang = { version = "0.30.0", features= ["init-if-needed"]} \ No newline at end of file +anchor-spl = "0.30.1" +anchor-lang = { version = "0.30.1", features= ["init-if-needed"]} \ No newline at end of file diff --git a/tokens/token-2022/cpi-guard/anchor/programs/cpi-guard/Cargo.toml b/tokens/token-2022/cpi-guard/anchor/programs/cpi-guard/Cargo.toml index 15f2b99eb..cd21f6fc4 100644 --- a/tokens/token-2022/cpi-guard/anchor/programs/cpi-guard/Cargo.toml +++ b/tokens/token-2022/cpi-guard/anchor/programs/cpi-guard/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"] } -anchor-spl = "0.30.0" +anchor-lang = { version = "0.30.1", features = ["init-if-needed"] } +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/default-account-state/anchor/programs/default-account-state/Cargo.toml b/tokens/token-2022/default-account-state/anchor/programs/default-account-state/Cargo.toml index 8f9580345..5f521d8c1 100644 --- a/tokens/token-2022/default-account-state/anchor/programs/default-account-state/Cargo.toml +++ b/tokens/token-2022/default-account-state/anchor/programs/default-account-state/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/default-account-state/native/program/Cargo.toml b/tokens/token-2022/default-account-state/native/program/Cargo.toml index e1d06f097..3d3be8153 100644 --- a/tokens/token-2022/default-account-state/native/program/Cargo.toml +++ b/tokens/token-2022/default-account-state/native/program/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.17.25" -spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" +spl-associated-token-account = { version="4.0.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "4.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/group/anchor/programs/group/Cargo.toml b/tokens/token-2022/group/anchor/programs/group/Cargo.toml index 8ddc0df4e..b7f8ec4d4 100644 --- a/tokens/token-2022/group/anchor/programs/group/Cargo.toml +++ b/tokens/token-2022/group/anchor/programs/group/Cargo.toml @@ -17,6 +17,6 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" -spl-token-group-interface = "=0.2.3" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" +spl-token-group-interface = "=0.3.0" diff --git a/tokens/token-2022/immutable-owner/anchor/programs/immutable-owner/Cargo.toml b/tokens/token-2022/immutable-owner/anchor/programs/immutable-owner/Cargo.toml index 9aa0d00b7..9e22ef100 100644 --- a/tokens/token-2022/immutable-owner/anchor/programs/immutable-owner/Cargo.toml +++ b/tokens/token-2022/immutable-owner/anchor/programs/immutable-owner/Cargo.toml @@ -17,6 +17,6 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/interest-bearing/anchor/programs/interest-bearing/Cargo.toml b/tokens/token-2022/interest-bearing/anchor/programs/interest-bearing/Cargo.toml index 6c6a77995..279130c4b 100644 --- a/tokens/token-2022/interest-bearing/anchor/programs/interest-bearing/Cargo.toml +++ b/tokens/token-2022/interest-bearing/anchor/programs/interest-bearing/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/memo-transfer/anchor/programs/memo-transfer/Cargo.toml b/tokens/token-2022/memo-transfer/anchor/programs/memo-transfer/Cargo.toml index 8048b1cc9..b098d154c 100644 --- a/tokens/token-2022/memo-transfer/anchor/programs/memo-transfer/Cargo.toml +++ b/tokens/token-2022/memo-transfer/anchor/programs/memo-transfer/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/metadata/anchor/programs/metadata/Cargo.toml b/tokens/token-2022/metadata/anchor/programs/metadata/Cargo.toml index 7678519b5..77648f340 100644 --- a/tokens/token-2022/metadata/anchor/programs/metadata/Cargo.toml +++ b/tokens/token-2022/metadata/anchor/programs/metadata/Cargo.toml @@ -17,8 +17,8 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" -spl-token-metadata-interface = "0.3.3" -spl-type-length-value = "0.4.3" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" +spl-token-metadata-interface = "0.4.0" +spl-type-length-value = "0.5.0" diff --git a/tokens/token-2022/mint-close-authority/anchor/programs/mint-close-authority/Cargo.toml b/tokens/token-2022/mint-close-authority/anchor/programs/mint-close-authority/Cargo.toml index c2881cc45..1c36e92ce 100644 --- a/tokens/token-2022/mint-close-authority/anchor/programs/mint-close-authority/Cargo.toml +++ b/tokens/token-2022/mint-close-authority/anchor/programs/mint-close-authority/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/mint-close-authority/native/program/Cargo.toml b/tokens/token-2022/mint-close-authority/native/program/Cargo.toml index 58360f9d8..525f97f66 100644 --- a/tokens/token-2022/mint-close-authority/native/program/Cargo.toml +++ b/tokens/token-2022/mint-close-authority/native/program/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" -spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" +spl-associated-token-account = { version="4.0.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "4.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/non-transferable/anchor/programs/non-transferable/Cargo.toml b/tokens/token-2022/non-transferable/anchor/programs/non-transferable/Cargo.toml index de10d19f2..06d948940 100644 --- a/tokens/token-2022/non-transferable/anchor/programs/non-transferable/Cargo.toml +++ b/tokens/token-2022/non-transferable/anchor/programs/non-transferable/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/Cargo.toml b/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/Cargo.toml index ddac943e9..88ecd7986 100644 --- a/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/Cargo.toml +++ b/tokens/token-2022/permanent-delegate/anchor/programs/permanent-delegate/Cargo.toml @@ -17,6 +17,6 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = "0.30.0" -anchor-spl = "0.30.0" +anchor-lang = "0.30.1" +anchor-spl = "0.30.1" diff --git a/tokens/token-2022/transfer-fee/anchor/programs/transfer-fee/Cargo.toml b/tokens/token-2022/transfer-fee/anchor/programs/transfer-fee/Cargo.toml index 23b4ac89a..8a1162749 100644 --- a/tokens/token-2022/transfer-fee/anchor/programs/transfer-fee/Cargo.toml +++ b/tokens/token-2022/transfer-fee/anchor/programs/transfer-fee/Cargo.toml @@ -17,5 +17,5 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["init-if-needed"] } -anchor-spl = "0.30.0" \ No newline at end of file +anchor-lang = { version = "0.30.1", features = ["init-if-needed"] } +anchor-spl = "0.30.1" \ No newline at end of file diff --git a/tokens/token-2022/transfer-fee/native/program/Cargo.toml b/tokens/token-2022/transfer-fee/native/program/Cargo.toml index e53bd1936..f10eef74c 100644 --- a/tokens/token-2022/transfer-fee/native/program/Cargo.toml +++ b/tokens/token-2022/transfer-fee/native/program/Cargo.toml @@ -4,9 +4,9 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.10.3" -borsh-derive = "0.9.1" -solana-program = "=1.17.25" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } diff --git a/tokens/token-2022/transfer-hook/counter/anchor/programs/transfer-hook/Cargo.toml b/tokens/token-2022/transfer-hook/counter/anchor/programs/transfer-hook/Cargo.toml index 0f9082323..c4e259344 100644 --- a/tokens/token-2022/transfer-hook/counter/anchor/programs/transfer-hook/Cargo.toml +++ b/tokens/token-2022/transfer-hook/counter/anchor/programs/transfer-hook/Cargo.toml @@ -21,8 +21,8 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["interface-instructions"] } -anchor-spl = "0.30.0" -solana-program = "1.18.16" -spl-tlv-account-resolution = "0.6.3" -spl-transfer-hook-interface = "0.6.3" +anchor-lang = { version = "0.30.1", features = ["interface-instructions"] } +anchor-spl = "0.30.1" +solana-program = "2.0.2" +spl-tlv-account-resolution = "0.7.0" +spl-transfer-hook-interface = "0.7.0" diff --git a/tokens/token-2022/transfer-hook/hello-world/anchor/programs/transfer-hook/Cargo.toml b/tokens/token-2022/transfer-hook/hello-world/anchor/programs/transfer-hook/Cargo.toml index e2987b506..673c9d43e 100644 --- a/tokens/token-2022/transfer-hook/hello-world/anchor/programs/transfer-hook/Cargo.toml +++ b/tokens/token-2022/transfer-hook/hello-world/anchor/programs/transfer-hook/Cargo.toml @@ -17,7 +17,7 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = { version = "0.30.0", features = ["interface-instructions"] } -anchor-spl = "0.30.0" -spl-tlv-account-resolution = "0.6.3" -spl-transfer-hook-interface = "0.6.3" +anchor-lang = { version = "0.30.1", features = ["interface-instructions"] } +anchor-spl = "0.30.1" +spl-tlv-account-resolution = "0.7.0" +spl-transfer-hook-interface = "0.7.0" diff --git a/tokens/token-2022/transfer-hook/transfer-cost/anchor/programs/transfer-hook/Cargo.toml b/tokens/token-2022/transfer-hook/transfer-cost/anchor/programs/transfer-hook/Cargo.toml index 9d9d6e64c..16bf09188 100644 --- a/tokens/token-2022/transfer-hook/transfer-cost/anchor/programs/transfer-hook/Cargo.toml +++ b/tokens/token-2022/transfer-hook/transfer-cost/anchor/programs/transfer-hook/Cargo.toml @@ -17,7 +17,7 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = {version = "0.30.0", features = ["interface-instructions"]} -anchor-spl = "0.30.0" -spl-tlv-account-resolution = "0.6.3" -spl-transfer-hook-interface = "0.6.3" +anchor-lang = {version = "0.30.1", features = ["interface-instructions"]} +anchor-spl = "0.30.1" +spl-tlv-account-resolution = "0.7.0" +spl-transfer-hook-interface = "0.7.0" diff --git a/tokens/token-2022/transfer-hook/whitelist/anchor/programs/transfer-hook/Cargo.toml b/tokens/token-2022/transfer-hook/whitelist/anchor/programs/transfer-hook/Cargo.toml index d91f71ab2..991bfb927 100644 --- a/tokens/token-2022/transfer-hook/whitelist/anchor/programs/transfer-hook/Cargo.toml +++ b/tokens/token-2022/transfer-hook/whitelist/anchor/programs/transfer-hook/Cargo.toml @@ -17,7 +17,7 @@ no-log-ix-name = [] idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"] [dependencies] -anchor-lang = {version = "0.30.0", features = ["interface-instructions", "init-if-needed"]} -anchor-spl = "0.30.0" -spl-tlv-account-resolution = "0.6.3" -spl-transfer-hook-interface = "0.6.3" +anchor-lang = {version = "0.30.1", features = ["interface-instructions", "init-if-needed"]} +anchor-spl = "0.30.1" +spl-tlv-account-resolution = "0.7.0" +spl-transfer-hook-interface = "0.7.0" diff --git a/tokens/transfer-tokens/native/program/Cargo.toml b/tokens/transfer-tokens/native/program/Cargo.toml index 8810f4f95..cc3d822cc 100644 --- a/tokens/transfer-tokens/native/program/Cargo.toml +++ b/tokens/transfer-tokens/native/program/Cargo.toml @@ -4,12 +4,12 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.1" -solana-program = "1.16.10" -spl-token = { version="4.0.0", features = [ "no-entrypoint" ] } -spl-associated-token-account = { version = "2.0.0", features = [ "no-entrypoint" ] } -mpl-token-metadata = { version="1.11", features = ["no-entrypoint"] } +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" +spl-token = { version="6.0.0", features = [ "no-entrypoint" ] } +spl-associated-token-account = { version = "4.0.0", features = [ "no-entrypoint" ] } +mpl-token-metadata = { version="4.1.2", features = ["no-entrypoint"] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tools/shank-and-solita/native/program/Cargo.toml b/tools/shank-and-solita/native/program/Cargo.toml index f5aa22b36..7121ad2af 100644 --- a/tools/shank-and-solita/native/program/Cargo.toml +++ b/tools/shank-and-solita/native/program/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -borsh = "0.9.3" -borsh-derive = "0.9.3" -shank = "0.0.12" -solana-program = "1.14.13" +borsh = "1.5.1" +borsh-derive = "1.5.1" +solana-program = "=2.0.2" +shank = "0.4.2" [lib] crate-type = ["cdylib", "lib"] From 56af0dc3e6279d081a674321487b669ebd0eca3b Mon Sep 17 00:00:00 2001 From: XuananLe Date: Tue, 16 Jul 2024 16:49:27 +0700 Subject: [PATCH 2/2] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 314280498..423fac09f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "basics/account-data/anchor/programs/anchor-program-example", "basics/checking-accounts/native/program", "basics/checking-accounts/anchor/programs/anchor-program-example", - "basics/close-account/native/program",` + "basics/close-account/native/program", "basics/close-account/anchor/programs/close-account", "basics/counter/native/program", "basics/counter/anchor/programs/counter_anchor",