diff --git a/Cargo.lock b/Cargo.lock index f54b45b7b..22a73cc60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -219,7 +219,7 @@ dependencies = [ "borsh 0.10.3", "bytemuck", "getrandom 0.2.15", - "solana-program", + "solana-program 1.18.17", "thiserror", ] @@ -451,6 +451,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" @@ -738,7 +744,7 @@ dependencies = [ name = "checking-accounts-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -765,7 +771,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -807,7 +813,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "shank", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -815,7 +821,7 @@ name = "counter-solana-native" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -838,7 +844,7 @@ dependencies = [ name = "create-account-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1154,7 +1160,7 @@ dependencies = [ name = "hello-solana-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1417,17 +1423,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -1457,34 +1452,13 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.3", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.72", + "num_enum_derive", ] [[package]] @@ -1571,7 +1545,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1610,16 +1584,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -1674,7 +1638,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1683,7 +1647,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1692,7 +1656,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1830,7 +1794,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1884,7 +1848,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -2188,7 +2152,7 @@ dependencies = [ "log", "memoffset", "num-bigint", - "num-derive 0.4.2", + "num-derive", "num-traits", "parking_lot", "rand 0.8.5", @@ -2202,13 +2166,59 @@ dependencies = [ "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk-macro", + "solana-sdk-macro 1.18.17", "thiserror", "tiny-bip39", "wasm-bindgen", "zeroize", ] +[[package]] +name = "solana-program" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2625a23c3813b620141ee447819b08d1b9a5f1c69a309754834e3f35798a21fb" +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", + "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.14", + "thiserror", + "wasm-bindgen", +] + [[package]] name = "solana-sdk" version = "1.18.17" @@ -2236,9 +2246,9 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.3", + "num_enum", "pbkdf2 0.11.0", "qstring", "qualifier_attr", @@ -2257,8 +2267,8 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", - "solana-program", - "solana-sdk-macro", + "solana-program 1.18.17", + "solana-sdk-macro 1.18.17", "thiserror", "uriparse", "wasm-bindgen", @@ -2277,6 +2287,19 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "solana-sdk-macro" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93a5a1eabc890415d326707afe62cd7a2009236e8d899c1519566fc8f7e3977b" +dependencies = [ + "bs58 0.5.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] + [[package]] name = "solana-security-txt" version = "1.1.1" @@ -2299,13 +2322,13 @@ dependencies = [ "itertools", "lazy_static", "merlin", - "num-derive 0.4.2", + "num-derive", "num-traits", "rand 0.7.3", "serde", "serde_json", "sha3 0.9.1", - "solana-program", + "solana-program 1.18.17", "solana-sdk", "subtle", "thiserror", @@ -2320,11 +2343,11 @@ checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", - "num-derive 0.4.2", + "num-derive", "num-traits", - "solana-program", + "solana-program 1.18.17", "spl-token", - "spl-token-2022 1.0.0", + "spl-token-2022", "thiserror", ] @@ -2335,7 +2358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator-derive", ] @@ -2363,22 +2386,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "spl-memo" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" -dependencies = [ - "solana-program", -] - [[package]] name = "spl-memo" version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a49f49f95f2d02111ded31696ab38a081fab623d4c76bd4cb074286db4560836" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -2389,22 +2403,9 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ "borsh 0.10.3", "bytemuck", - "solana-program", + "solana-program 1.18.17", "solana-zk-token-sdk", - "spl-program-error 0.3.0", -] - -[[package]] -name = "spl-program-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af92f74cd3b0fdfda59fef4b571a92123e4df0f67cc43f73163975d31118ef82" -dependencies = [ - "num-derive 0.3.3", - "num-traits", - "solana-program", - "spl-program-error-derive 0.2.0", - "thiserror", + "spl-program-error", ] [[package]] @@ -2413,24 +2414,13 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ - "num-derive 0.4.2", + "num-derive", "num-traits", - "solana-program", - "spl-program-error-derive 0.3.2", + "solana-program 1.18.17", + "spl-program-error-derive", "thiserror", ] -[[package]] -name = "spl-program-error-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173f3cc506847882189b3a5b67299f617fed2f9730f122dd197b82e1e213dee5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "spl-program-error-derive" version = "0.3.2" @@ -2443,19 +2433,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "spl-tlv-account-resolution" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82149a5a06b5f158d03904066375eaf0c8a2422557cc3d5a25d277260d9a3b16" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-program-error 0.2.0", - "spl-type-length-value 0.2.0", -] - [[package]] name = "spl-tlv-account-resolution" version = "0.5.1" @@ -2463,11 +2440,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", - "spl-program-error 0.3.0", - "spl-type-length-value 0.3.0", + "spl-program-error", + "spl-type-length-value", ] [[package]] @@ -2478,29 +2455,10 @@ checksum = "b9eb465e4bf5ce1d498f05204c8089378c1ba34ef2777ea95852fc53a1fd4fb2" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.3", - "solana-program", - "thiserror", -] - -[[package]] -name = "spl-token-2022" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b24ac5786a3fefbf59f5606312c61abf87b23154e7a717e5d18216fbea4711db" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.6.1", - "solana-program", - "solana-zk-token-sdk", - "spl-memo 3.0.1", - "spl-token", - "spl-transfer-hook-interface 0.1.0", + "num_enum", + "solana-program 1.18.17", "thiserror", ] @@ -2512,19 +2470,19 @@ checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.3", - "solana-program", + "num_enum", + "solana-program 1.18.17", "solana-security-txt", "solana-zk-token-sdk", - "spl-memo 4.0.4", + "spl-memo", "spl-pod", "spl-token", "spl-token-group-interface", "spl-token-metadata-interface", - "spl-transfer-hook-interface 0.4.1", - "spl-type-length-value 0.3.0", + "spl-transfer-hook-interface", + "spl-type-length-value", "thiserror", ] @@ -2535,10 +2493,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", - "spl-program-error 0.3.0", + "spl-program-error", ] [[package]] @@ -2548,70 +2506,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ "borsh 0.10.3", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", - "spl-program-error 0.3.0", - "spl-type-length-value 0.3.0", + "spl-program-error", + "spl-type-length-value", ] [[package]] name = "spl-transfer-hook-interface" -version = "0.1.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2326852adf88716fbac7f54cd6ee2c8a0b5a14ede24db3b4519c4ff13df04b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", - "spl-tlv-account-resolution 0.2.0", - "spl-type-length-value 0.2.0", - "thiserror", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.4.1" +name = "spl-type-length-value" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ - "arrayref", "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", - "spl-program-error 0.3.0", - "spl-tlv-account-resolution 0.5.1", - "spl-type-length-value 0.3.0", + "spl-program-error", ] [[package]] -name = "spl-type-length-value" -version = "0.2.0" +name = "steel" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d085f426b33b8365fb98383d1b8b3925e21bdfe579c851ceaa7f511dbec191" +checksum = "d88c610ca9fd5e4e51bdb6e9964114133a42f006713fe38aff37266fac91e1be" dependencies = [ "bytemuck", - "solana-program", - "spl-discriminator", - "spl-program-error 0.2.0", + "num_enum", + "solana-program 1.18.17", + "thiserror", ] [[package]] -name = "spl-type-length-value" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +name = "steel-hello-solana" +version = "0.1.0" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error 0.3.0", + "solana-program 2.0.14", + "steel", ] [[package]] @@ -2729,9 +2677,9 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", "spl-associated-token-account", - "spl-token-2022 0.7.0", + "spl-token-2022", ] [[package]] @@ -2740,9 +2688,9 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", "spl-associated-token-account", - "spl-token-2022 0.7.0", + "spl-token-2022", ] [[package]] @@ -2751,9 +2699,9 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", "spl-associated-token-account", - "spl-token-2022 0.7.0", + "spl-token-2022", ] [[package]] @@ -2762,9 +2710,9 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", "spl-associated-token-account", - "spl-token-2022 0.7.0", + "spl-token-2022", ] [[package]] @@ -2773,9 +2721,9 @@ version = "0.1.0" dependencies = [ "borsh 0.10.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", "spl-associated-token-account", - "spl-token-2022 0.7.0", + "spl-token-2022", ] [[package]] @@ -2808,17 +2756,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -2856,7 +2793,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "borsh-derive 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] 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 8608a9fdc..538712394 100644 --- a/tokens/token-2022/default-account-state/native/program/Cargo.toml +++ b/tokens/token-2022/default-account-state/native/program/Cargo.toml @@ -8,7 +8,7 @@ borsh = "0.9.3" borsh-derive = "0.9.1" solana-program = "1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "1.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] 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..5b75538ec 100644 --- a/tokens/token-2022/mint-close-authority/native/program/Cargo.toml +++ b/tokens/token-2022/mint-close-authority/native/program/Cargo.toml @@ -8,7 +8,7 @@ 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" ] } +spl-token-2022 = {version = "1.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/multiple-extensions/native/program/Cargo.toml b/tokens/token-2022/multiple-extensions/native/program/Cargo.toml index f0f41d285..69b46336e 100644 --- a/tokens/token-2022/multiple-extensions/native/program/Cargo.toml +++ b/tokens/token-2022/multiple-extensions/native/program/Cargo.toml @@ -8,7 +8,7 @@ borsh = "0.9.3" borsh-derive = "0.9.1" solana-program = "1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "1.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/non-transferable/native/program/Cargo.toml b/tokens/token-2022/non-transferable/native/program/Cargo.toml index d03cd5d4c..615395387 100644 --- a/tokens/token-2022/non-transferable/native/program/Cargo.toml +++ b/tokens/token-2022/non-transferable/native/program/Cargo.toml @@ -8,7 +8,7 @@ borsh = "0.9.3" borsh-derive = "0.9.1" solana-program = "=1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "1.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"] diff --git a/tokens/token-2022/transfer-fee/native/program/Cargo.toml b/tokens/token-2022/transfer-fee/native/program/Cargo.toml index f1c31c8f0..b01000eec 100644 --- a/tokens/token-2022/transfer-fee/native/program/Cargo.toml +++ b/tokens/token-2022/transfer-fee/native/program/Cargo.toml @@ -8,7 +8,7 @@ borsh = "0.10.3" borsh-derive = "0.9.1" solana-program = "=1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } -spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } +spl-token-2022 = {version = "1.0.0", features = [ "no-entrypoint" ] } [lib] crate-type = ["cdylib", "lib"]