From ea40943843ba9a51efa4c31f0bc876be4c192488 Mon Sep 17 00:00:00 2001 From: Olex Filipenko Date: Thu, 11 Jan 2024 14:23:04 +0100 Subject: [PATCH] [FEATURE] - Update anchor-lang to 0.29.0, bump clockwork version to 2.0.20 --- Cargo.lock | 511 +++++++++++++----- cli/Cargo.toml | 30 +- cron/Cargo.toml | 2 +- plugin/Cargo.toml | 32 +- plugin/utils/Cargo.toml | 4 +- programs/network/Cargo.toml | 8 +- .../src/instructions/delegation_withdraw.rs | 2 +- .../stake_delegations/process_delegation.rs | 2 +- programs/network/src/state/fee.rs | 2 +- programs/thread/Cargo.toml | 10 +- .../thread/src/instructions/thread_create.rs | 2 +- programs/thread/v1/Cargo.toml | 2 +- programs/webhook/Cargo.toml | 8 +- relayer/Cargo.toml | 14 +- relayer/api/Cargo.toml | 6 +- sdk/Cargo.toml | 6 +- utils/Cargo.toml | 4 +- 17 files changed, 434 insertions(+), 211 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0c0fa58..d15c296c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -308,10 +308,11 @@ dependencies = [ [[package]] name = "anchor-attribute-access-control" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5f619f1d04f53621925ba8a2e633ba5a6081f2ae14758cbb67f38fd823e0a3e" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "proc-macro2 1.0.66", "quote 1.0.33", "syn 1.0.109", @@ -319,10 +320,11 @@ dependencies = [ [[package]] name = "anchor-attribute-account" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f2a3e1df4685f18d12a943a9f2a7456305401af21a07c9fe076ef9ecd6e400" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "bs58 0.5.0", "proc-macro2 1.0.66", "quote 1.0.33", @@ -331,30 +333,33 @@ dependencies = [ [[package]] name = "anchor-attribute-constant" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9423945cb55627f0b30903288e78baf6f62c6c8ab28fb344b6b25f1ffee3dca7" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "anchor-attribute-error" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ed12720033cc3c3bf3cfa293349c2275cd5ab99936e33dd4bf283aaad3e241" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "anchor-attribute-event" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eef4dc0371eba2d8c8b54794b0b0eb786a234a559b77593d6f80825b6d2c77a2" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "proc-macro2 1.0.66", "quote 1.0.33", "syn 1.0.109", @@ -362,31 +367,34 @@ dependencies = [ [[package]] name = "anchor-attribute-program" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b18c4f191331e078d4a6a080954d1576241c29c56638783322a18d308ab27e4f" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "anchor-derive-accounts" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de10d6e9620d3bcea56c56151cad83c5992f50d5960b3a9bebc4a50390ddc3c" dependencies = [ - "anchor-syn 0.28.0", + "anchor-syn 0.29.0", "quote 1.0.33", "syn 1.0.109", ] [[package]] name = "anchor-derive-serde" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e2e5be518ec6053d90a2a7f26843dbee607583c779e6c8395951b9739bdfbe" dependencies = [ - "anchor-syn 0.28.0", - "borsh-derive-internal 0.9.3", + "anchor-syn 0.29.0", + "borsh-derive-internal 0.10.3", "proc-macro2 1.0.66", "quote 1.0.33", "syn 1.0.109", @@ -394,8 +402,9 @@ dependencies = [ [[package]] name = "anchor-derive-space" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecc31d19fa54840e74b7a979d44bcea49d70459de846088a1d71e87ba53c419" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.33", @@ -404,8 +413,9 @@ dependencies = [ [[package]] name = "anchor-lang" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35da4785497388af0553586d55ebdc08054a8b1724720ef2749d313494f2b8ad" dependencies = [ "anchor-attribute-access-control", "anchor-attribute-account", @@ -419,7 +429,7 @@ dependencies = [ "arrayref", "base64 0.13.1", "bincode", - "borsh 0.9.3", + "borsh 0.10.3", "bytemuck", "getrandom 0.2.9", "solana-program", @@ -428,14 +438,15 @@ dependencies = [ [[package]] name = "anchor-spl" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a" dependencies = [ "anchor-lang", "solana-program", - "spl-associated-token-account", - "spl-token 3.5.0", - "spl-token-2022", + "spl-associated-token-account 2.2.0", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", ] [[package]] @@ -458,8 +469,9 @@ dependencies = [ [[package]] name = "anchor-syn" -version = "0.28.0" -source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9101b84702fed2ea57bd22992f75065da5648017135b844283a2f6d74f27825" dependencies = [ "anyhow", "bs58 0.5.0", @@ -1037,9 +1049,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] @@ -1280,7 +1292,7 @@ dependencies = [ [[package]] name = "clockwork-cli" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "anchor-spl", @@ -1308,7 +1320,7 @@ dependencies = [ "solana-cli-config", "solana-client", "solana-sdk", - "spl-associated-token-account", + "spl-associated-token-account 1.1.3", "spl-memo 4.0.0", "spl-token 4.0.0", "tar", @@ -1318,7 +1330,7 @@ dependencies = [ [[package]] name = "clockwork-cron" -version = "2.0.19" +version = "2.0.20" dependencies = [ "chrono", "nom", @@ -1327,7 +1339,7 @@ dependencies = [ [[package]] name = "clockwork-network-program" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "anchor-spl", @@ -1336,7 +1348,7 @@ dependencies = [ [[package]] name = "clockwork-plugin-utils" -version = "2.0.19" +version = "2.0.20" dependencies = [ "serde", "serde_json", @@ -1345,7 +1357,7 @@ dependencies = [ [[package]] name = "clockwork-relayer" -version = "2.0.19" +version = "2.0.20" dependencies = [ "actix-cors", "actix-web", @@ -1369,7 +1381,7 @@ dependencies = [ [[package]] name = "clockwork-relayer-api" -version = "2.0.19" +version = "2.0.20" dependencies = [ "bincode", "serde", @@ -1378,7 +1390,7 @@ dependencies = [ [[package]] name = "clockwork-sdk" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "chrono", @@ -1389,7 +1401,7 @@ dependencies = [ [[package]] name = "clockwork-thread-program" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "chrono", @@ -1412,7 +1424,7 @@ dependencies = [ [[package]] name = "clockwork-utils" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "base64 0.13.1", @@ -1423,7 +1435,7 @@ dependencies = [ [[package]] name = "clockwork-webhook-program" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "clockwork-network-program", @@ -1433,7 +1445,7 @@ dependencies = [ [[package]] name = "clockwork_plugin" -version = "2.0.19" +version = "2.0.20" dependencies = [ "anchor-lang", "async-trait", @@ -3066,6 +3078,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.31", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -3136,6 +3159,15 @@ dependencies = [ "num_enum_derive 0.6.1", ] +[[package]] +name = "num_enum" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +dependencies = [ + "num_enum_derive 0.7.0", +] + [[package]] name = "num_enum_derive" version = "0.5.11" @@ -3160,6 +3192,18 @@ dependencies = [ "syn 2.0.31", ] +[[package]] +name = "num_enum_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.31", +] + [[package]] name = "num_threads" version = "0.1.6" @@ -3498,7 +3542,7 @@ dependencies = [ "borsh 0.10.3", "borsh-derive 0.10.3", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "pyth-sdk", "serde", @@ -3535,9 +3579,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", "rand 0.8.5", @@ -4277,9 +4321,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e0074eb8b7115c7648de67d1dd1cc31505afcc9ebe16eb4ba3cff6f1520385" +checksum = "83da6908b4865a9680c4fcb5e77d319467fdc5ab96a6ccc8361e7110ebcd206e" dependencies = [ "Inflector", "base64 0.21.3", @@ -4293,22 +4337,23 @@ dependencies = [ "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", - "spl-token 3.5.0", - "spl-token-2022", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "spl-token-metadata-interface", "thiserror", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "solana-address-lookup-table-program" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85261ec5a2cee18d926e1c48265a760896fa06a6b431b3f1d43a8b0f7a3aa28d" +checksum = "9102429e980b8e58f05e39a2aceb799fc1fd7b81e440bc70322854e0debb21dc" dependencies = [ "bincode", "bytemuck", "log 0.4.17", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -4322,9 +4367,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae8384f3a2fa5f765de3f4c2d6dc2b26d4a6ac0b740f5318d17326158fa0c0a" +checksum = "fe15843171a435eed014e7180f62c0d5e7e8178f7eaf4da0077ea21354506e2a" dependencies = [ "chrono", "clap 2.34.0", @@ -4340,9 +4385,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae44ab7fbb1b26df2bf71bdc3a0c1dc9aaabfa9ba1ecd9acb1f54614d01b86f" +checksum = "6430afcc4444bd3b7b16b9314f0ae533344d0cd9bbbd160fb47cb45f9689a801" dependencies = [ "dirs-next", "lazy_static", @@ -4356,9 +4401,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84514073c108af24e0408e00d7e490e4f90e87c1a4ee4dcffa34b200d1da446b" +checksum = "38917c4655a42881fd2998c5c7626fa4cee9f95d5877592b347b213782782145" dependencies = [ "async-trait", "bincode", @@ -4389,9 +4434,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f2c6b161fc8e7bd86733559eaf6142f271dda233efd7fa1e2edacf98b4cc4cd" +checksum = "b8c2804d121a6d87f4b0cb861dc26e677e76953f4888a43292e34c5e6c5f2852" dependencies = [ "bincode", "chrono", @@ -4403,9 +4448,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1162b7d11807c5b5c77b2da3fbf9df7bd7fc71c9d6ecf3c13a5ff8541928a7b" +checksum = "2fe0460a6005bb2d9ee1d4bce9379ff50c1b438f6f1c8dc867d8b74141f68349" dependencies = [ "async-trait", "bincode", @@ -4424,9 +4469,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0447b0bb6ab6c6fc0e83bd106618c23d241c4fb8090de715a9811fb993fbfd07" +checksum = "8a63aebf4beac713a1949216ae180355c044df9cc3db9a58ca153bb10bb5843b" dependencies = [ "ahash 0.8.3", "blake3", @@ -4457,9 +4502,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc86a118888cef8a3878f6dc9c291787cb21ef50cd98e7271f1e0ff548153b8" +checksum = "bced1b3c0421605312fd7eae7ceb6850d3b1d2e939da349c928e6d46a945c829" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.33", @@ -4469,9 +4514,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a8b30348425f623e9ae3de88a828671174fb661224486e7c5ed4144126c660" +checksum = "4dd87fe25abd423368147feed1384a9db7838de9b19d254a0718b773c7db10ff" dependencies = [ "log 0.4.17", "solana-sdk", @@ -4481,9 +4526,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac77d7fc0144181d4f6c8eb4203bb5fe54d486fa19ccaab7615ccb4b874b0de" +checksum = "c95311f23906f0fa4a6d995f3c39593db18e4d943e4d3fbf082a510d0881d7af" dependencies = [ "env_logger", "lazy_static", @@ -4492,9 +4537,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441deecebeb23ff7da89df5db5ec712458903c7cc733c8ae1e0a26daf2c1130a" +checksum = "944244553c62855c57d05ac049140762f1e095188a0e5b973b859947ac1d00bf" dependencies = [ "log 0.4.17", "solana-sdk", @@ -4502,9 +4547,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229583448485d731afb88e2bfd3a6b978312d4690c7452a35f8da47c02d4fd4f" +checksum = "f02b2244ee93fd282f057146ce779987a96cdeba5615d43dc0b6347b96134772" dependencies = [ "crossbeam-channel", "gethostname", @@ -4516,9 +4561,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e246018a28e65d02d2b0e5141d3f89865a92e8b495a468a632b7028396626c" +checksum = "f1dad26635fb41e948f56e1b896eab10e84cc62e00c59109a428a95c78fd6560" dependencies = [ "bincode", "clap 3.2.23", @@ -4538,9 +4583,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103fe87a578aa1771ee992e2654b2830ffc16709d429c3bb0d2c36ef8fee4d1d" +checksum = "b03a0782c2b62c476c3fafd4e002ad8d91a2e36ca952df8e965d81dbf1dc158d" dependencies = [ "ahash 0.8.3", "bincode", @@ -4565,9 +4610,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3841458623bd80b8291e8991f7353d674bb39656b1db83ec1aa5916a1b6ed7c" +checksum = "e1f5c12cb15108734adae20be5e922c2db09d9623099541dcc61790703c6271c" dependencies = [ "ark-bn254", "ark-ec", @@ -4596,7 +4641,7 @@ dependencies = [ "log 0.4.17", "memoffset 0.9.0", "num-bigint 0.4.3", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "rand 0.7.3", @@ -4620,9 +4665,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72cc1b1f3a5a9f6735668a67e3d1fe161ec2d4931ef523acc4d716704b9fc11f" +checksum = "eb7d1b8df43a93c410456be7d41c0dca9e2c460530a075243a98f556391d2bf9" dependencies = [ "base64 0.21.3", "bincode", @@ -4631,7 +4676,7 @@ dependencies = [ "itertools", "libc", "log 0.4.17", - "num-derive", + "num-derive 0.3.3", "num-traits", "percentage", "rand 0.7.3", @@ -4648,9 +4693,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df90f4a572b3d5d601ca6a8bde0d6024b45fc4204753b74a5156a538aac3b7c6" +checksum = "3b06d8521ac6edf8e8080cb5411f3b831a400341274036528a6364d52f2a97a4" dependencies = [ "crossbeam-channel", "futures-util", @@ -4673,9 +4718,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433148255e4f526a0bb50f3f33e58e9552616c7c942235abd64fee66c0d1787" +checksum = "4cba7522b79c889136f99aef825f874be07e94afef561b85a13e9ea3c012d778" dependencies = [ "async-mutex", "async-trait", @@ -4701,9 +4746,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e85499464599434befb08ba5b89d4bed5cd58bf67d1d36fc8f2025605576e2" +checksum = "dd2081d1ed74301999e73e437c25c17dca82038e5472e104caf34b2657b3ba4a" dependencies = [ "lazy_static", "num_cpus", @@ -4711,14 +4756,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1012c7d172982f89efefddadc07679dcc82ebf9efc9031313860c622d31725eb" +checksum = "0a08a9c833b21fe9ec6ab74ea271de236cf7fd2602f34283752bba9c25d62304" dependencies = [ "console", "dialoguer", "log 0.4.17", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "qstring", @@ -4730,9 +4775,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cead295f632db6a5c9806f483dc05be50dc4e02cf54e7b8b5afb470064c8e2e3" +checksum = "1301ef82a9e87afb28bfccab1b3ebf8f10d6d2ee42c5b1d793ab989d70f83e27" dependencies = [ "async-trait", "base64 0.21.3", @@ -4756,9 +4801,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94b4b99de2430a5baa6c27f713dec67b934aa693fc2045f8aead5168adabea3" +checksum = "9ffdfe666315851d1a5c3d426a688dccfd2af19b46667140ea59b9ddf3988038" dependencies = [ "base64 0.21.3", "bs58 0.4.0", @@ -4772,15 +4817,15 @@ dependencies = [ "solana-sdk", "solana-transaction-status", "solana-version", - "spl-token-2022", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe2970736880aa250ea05a3b62dd07e5ee8e8650440f1217d3f9b6edac05d2f" +checksum = "d45f9be345ea2d29eb2c43d4b9a4c5181513f0af3e366be8b5e478ef451177be" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -4791,9 +4836,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87608d9cbf39d4f72cfb61179c320b3cea7f972671ec74dea99d255fd3a99ca9" +checksum = "051b93dc7737a7fb530c1e74f135a652bb69f5554c8804b2ebf55d6fb6a30f26" dependencies = [ "assert_matches", "base64 0.21.3", @@ -4816,7 +4861,7 @@ dependencies = [ "libsecp256k1", "log 0.4.17", "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", "pbkdf2 0.11.0", @@ -4844,9 +4889,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9077bd44586a902c9949d4e0cf4647ae2723ae2f0feca1e94d8fe9dcd4e2160d" +checksum = "a1fae2d1f62d655f88280a39711db401973d1bbe54fec9f795be80b9d76837ae" dependencies = [ "bs58 0.4.0", "proc-macro2 1.0.66", @@ -4857,9 +4902,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f43f8a5e4d579a41cab0195de05fe44f8c9a171debdf355cb284320ffbf916f" +checksum = "f9cf11ed42da5fd14f4fd197d325951d2d7890aab8e25a7782f8b7540918d3a1" dependencies = [ "async-channel", "bytes", @@ -4890,9 +4935,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cc93907e18bf298da73b067ae4844c6d542d4d89aadf2e18443079ab893ef7" +checksum = "bffbc01cdc316ff88398afbcd3befa78919049362bfe1a8a5794c942ce34bd96" dependencies = [ "bincode", "log 0.4.17", @@ -4905,9 +4950,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec22964554632c96e2d82a4da17422ae98534bd75ea69e29f7f44c39537109d" +checksum = "8209c111aff1fcf3028a8ee39c7c2171012fda5b31a72b2427d2c2d989dc6d3c" dependencies = [ "async-trait", "bincode", @@ -4930,14 +4975,14 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc2fae62bb9266a196c9de6c25e484305d95a18bc05e304a176f95811a4e916" +checksum = "bdad82a1e22d7c3fc1e009eeec4e8841697f6cce1902b7a1d5b73baf2bcca2e5" dependencies = [ "Inflector", "base64 0.21.3", "bincode", - "borsh 0.9.3", + "borsh 0.10.3", "bs58 0.4.0", "lazy_static", "log 0.4.17", @@ -4947,18 +4992,18 @@ dependencies = [ "solana-account-decoder", "solana-address-lookup-table-program", "solana-sdk", - "spl-associated-token-account", - "spl-memo 3.0.1", - "spl-token 3.5.0", - "spl-token-2022", + "spl-associated-token-account 2.2.0", + "spl-memo 4.0.0", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", "thiserror", ] [[package]] name = "solana-udp-client" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ad75fc5355aacc4acdf8c5e4201e425c76769a74b842d1618ef58e8cdca66f" +checksum = "a48721c6347353071589e3fbade33079e7ebade6087bb5b10edc788ad41b1ae2" dependencies = [ "async-trait", "solana-connection-cache", @@ -4971,9 +5016,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8eed97d5addc338b857991dd26496e236f9711373cdf470682ec8548af454a3" +checksum = "de7e99eb16bdc91861829bf0a6e361dd87ab898673b3708ebacf4ba27ca4d242" dependencies = [ "log 0.4.17", "rustc_version", @@ -4987,13 +5032,13 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fb2eb8114089c792929f2a2e9b4f1fa1c7d6296bbb8e5120b0a18fa6f8b75a" +checksum = "22b1a3a2d9807a4141f0a550fdb3fa61a4aac4b4e7ea31694739509a43b9fa23" dependencies = [ "bincode", "log 0.4.17", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -5009,9 +5054,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.12" +version = "1.16.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d498188b9ff5dcef1f356888d128a9b583aee8bfe87bc6746db02b2d492f97" +checksum = "ad3cc2b931a39510b1c90dc876a93ae315b9712a8338296e4b60519d09e57be9" dependencies = [ "aes-gcm-siv", "base64 0.21.3", @@ -5023,7 +5068,7 @@ dependencies = [ "itertools", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", "rand 0.7.3", "serde", @@ -5038,9 +5083,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3082ec3a1d4ef7879eb5b84916d5acde057abd59733eec3647e0ab8885283ef" +checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" dependencies = [ "byteorder", "combine", @@ -5079,11 +5124,62 @@ checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ "assert_matches", "borsh 0.9.3", - "num-derive", + "num-derive 0.3.3", "num-traits", "solana-program", "spl-token 3.5.0", - "spl-token-2022", + "spl-token-2022 0.6.1", + "thiserror", +] + +[[package]] +name = "spl-associated-token-account" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +dependencies = [ + "assert_matches", + "borsh 0.10.3", + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "thiserror", +] + +[[package]] +name = "spl-discriminator" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" +dependencies = [ + "quote 1.0.33", + "spl-discriminator-syn", + "syn 2.0.31", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.33", + "sha2 0.10.6", + "syn 2.0.31", "thiserror", ] @@ -5105,6 +5201,58 @@ dependencies = [ "solana-program", ] +[[package]] +name = "spl-pod" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +dependencies = [ + "borsh 0.10.3", + "bytemuck", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error", +] + +[[package]] +name = "spl-program-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +dependencies = [ + "num-derive 0.4.1", + "num-traits", + "solana-program", + "spl-program-error-derive", + "thiserror", +] + +[[package]] +name = "spl-program-error-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.33", + "sha2 0.10.6", + "syn 2.0.31", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + [[package]] name = "spl-token" version = "3.5.0" @@ -5113,7 +5261,7 @@ checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.5.11", "solana-program", @@ -5128,7 +5276,7 @@ checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", "solana-program", @@ -5143,7 +5291,7 @@ checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "num_enum 0.5.11", "solana-program", @@ -5153,6 +5301,71 @@ dependencies = [ "thiserror", ] +[[package]] +name = "spl-token-2022" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive 0.4.1", + "num-traits", + "num_enum 0.7.0", + "solana-program", + "solana-zk-token-sdk", + "spl-memo 4.0.0", + "spl-pod", + "spl-token 4.0.0", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", + "thiserror", +] + +[[package]] +name = "spl-token-metadata-interface" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +dependencies = [ + "borsh 0.10.3", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", +] + +[[package]] +name = "spl-type-length-value" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "static-pubkey" version = "1.0.3" @@ -6197,3 +6410,13 @@ dependencies = [ "libc", "pkg-config", ] + +[[patch.unused]] +name = "anchor-lang" +version = "0.28.0" +source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" + +[[patch.unused]] +name = "anchor-spl" +version = "0.28.0" +source = "git+https://github.com/coral-xyz/anchor?branch=master#b9fa898384748edeaeb26d00c1e7d50054d94717" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c13e30a9..00281d3c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-cli" -version = "2.0.19" +version = "2.0.20" description = "Command line interface for Clockwork" edition = "2021" license = "AGPL-3.0-or-later" @@ -12,19 +12,19 @@ keywords = ["solana"] build = "build.rs" [dependencies] -anchor-lang = "0.28.0" -anchor-spl = { features = ["mint", "token"], version = "0.28.0" } +anchor-lang = "0.29.0" +anchor-spl = { features = ["mint", "token"], version = "0.29.0" } anyhow = "1.0.61" bincode = "1.3.3" bzip2 = "0.4" clap = { version = "3.1.2", features = ["derive"] } -clockwork-cron = { path = "../cron", version = "=2.0.19" } -clockwork-network-program = { path = "../programs/network", version = "=2.0.19", features = ["no-entrypoint"] } -clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.19" } -clockwork-plugin-utils= { path = "../plugin/utils", version = "=2.0.19" } -clockwork-thread-program = { path = "../programs/thread", version = "=2.0.19", features = ["no-entrypoint"] } -clockwork-utils = { path = "../utils", version = "=2.0.19" } -clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.19", features = ["no-entrypoint"] } +clockwork-cron = { path = "../cron", version = "=2.0.20" } +clockwork-network-program = { path = "../programs/network", version = "=2.0.20", features = ["no-entrypoint"] } +clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.20" } +clockwork-plugin-utils= { path = "../plugin/utils", version = "=2.0.20" } +clockwork-thread-program = { path = "../programs/thread", version = "=2.0.20", features = ["no-entrypoint"] } +clockwork-utils = { path = "../utils", version = "=2.0.20" } +clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.20", features = ["no-entrypoint"] } chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } dirs-next = "2.0.0" indicatif = "0.16" @@ -32,11 +32,11 @@ reqwest = "0.11.14" serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" serde_yaml = "0.9.4" -solana-account-decoder = "=1.16.12" -solana-client = "=1.16.12" -solana-clap-utils = "=1.16.12" -solana-cli-config = "=1.16.12" -solana-sdk = "=1.16.12" +solana-account-decoder = "^1.16.13" +solana-client = "^1.16.13" +solana-clap-utils = "^1.16.13" +solana-cli-config = "^1.16.13" +solana-sdk = "^1.16.13" spl-associated-token-account = "1.1.1" spl-memo = "4.0.0" spl-token = "~4.0.0" diff --git a/cron/Cargo.toml b/cron/Cargo.toml index cb7188a4..304ddba6 100644 --- a/cron/Cargo.toml +++ b/cron/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-cron" -version = "2.0.19" +version = "2.0.20" description = "A cron expression parser that's safe to use in the Solana runtime" edition = "2021" license = "AGPL-3.0-or-later" diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index 6e3fef8f..8866d62e 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork_plugin" -version = "2.0.19" +version = "2.0.20" # this needs to match whatever solana uses! rust-version = "1.72.0" edition = "2021" @@ -19,21 +19,21 @@ crate-type = ["cdylib", "rlib"] name = "clockwork_plugin" [dependencies] -anchor-lang = "0.28.0" +anchor-lang = "0.29.0" async_once = "0.2.6" async-trait = "0.1.64" bincode = "1.3.3" bs58 = "0.4.0" bugsnag = "0.2.1" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -clockwork-cron = { path = "../cron", version = "=2.0.19" } -clockwork-network-program = { path = "../programs/network", version = "=2.0.19" } -clockwork-plugin-utils = { path = "utils", version = "=2.0.19" } -clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.19" } -clockwork-thread-program = { package = "clockwork-thread-program", path = "../programs/thread", version = "=2.0.19" } +clockwork-cron = { path = "../cron", version = "=2.0.20" } +clockwork-network-program = { path = "../programs/network", version = "=2.0.20" } +clockwork-plugin-utils = { path = "utils", version = "=2.0.20" } +clockwork-relayer-api = { path = "../relayer/api", version = "=2.0.20" } +clockwork-thread-program = { package = "clockwork-thread-program", path = "../programs/thread", version = "=2.0.20" } clockwork-thread-program-v1 = { package = "clockwork-thread-program-v1", path = "../programs/thread/v1", version = "=1.4.4" } -clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.19" } -clockwork-utils = { path = "../utils", version = "=2.0.19" } +clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.20" } +clockwork-utils = { path = "../utils", version = "=2.0.20" } lazy_static = "1.4.0" log = "0.4" prost = "0.10.0" @@ -42,13 +42,13 @@ reqwest = "0.11.11" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" simple-error = "0.2.3" -solana-account-decoder = "=1.16.12" -solana-client = "=1.16.12" -solana-geyser-plugin-interface = "=1.16.12" -solana-logger = "=1.16.12" -solana-program = "=1.16.12" -solana-sdk = "=1.16.12" -solana-transaction-status = "=1.16.12" +solana-account-decoder = "^1.16.13" +solana-client = "^1.16.13" +solana-geyser-plugin-interface = "^1.16.13" +solana-logger = "^1.16.13" +solana-program = "^1.16.13" +solana-sdk = "^1.16.13" +solana-transaction-status = "^1.16.13" thiserror = "1.0.30" tokio = "1.18.4" futures = "0.3.26" diff --git a/plugin/utils/Cargo.toml b/plugin/utils/Cargo.toml index 17a85271..adae2798 100644 --- a/plugin/utils/Cargo.toml +++ b/plugin/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-plugin-utils" -version = "2.0.19" +version = "2.0.20" edition = "2021" description = "Clockwork Plugin Utils" license = "AGPL-3.0-or-later" @@ -17,4 +17,4 @@ name = "clockwork_plugin_utils" [dependencies] serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -solana-geyser-plugin-interface = "=1.16.12" +solana-geyser-plugin-interface = "^1.16.13" diff --git a/programs/network/Cargo.toml b/programs/network/Cargo.toml index 6aa56138..d901188f 100644 --- a/programs/network/Cargo.toml +++ b/programs/network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-network-program" -version = "2.0.19" +version = "2.0.20" description = "Clockwork networking protocol" edition = "2021" license = "AGPL-3.0-or-later" @@ -22,6 +22,6 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = "0.28.0" -anchor-spl = { features = ["mint", "token"], version = "0.28.0" } -clockwork-utils = { path = "../../utils", version = "=2.0.19" } +anchor-lang = "0.29.0" +anchor-spl = { features = ["mint", "token"], version = "0.29.0" } +clockwork-utils = { path = "../../utils", version = "=2.0.20" } diff --git a/programs/network/src/instructions/delegation_withdraw.rs b/programs/network/src/instructions/delegation_withdraw.rs index 92ef8dc5..38d22e7b 100644 --- a/programs/network/src/instructions/delegation_withdraw.rs +++ b/programs/network/src/instructions/delegation_withdraw.rs @@ -51,7 +51,7 @@ pub fn handler(ctx: Context, amount: u64) -> Result<()> { let token_program = &ctx.accounts.token_program; // Transfer tokens from authority tokens to delegation - let bump = *ctx.bumps.get("delegation").unwrap(); + let bump = ctx.bumps.delegation; transfer( CpiContext::new_with_signer( token_program.to_account_info(), diff --git a/programs/network/src/jobs/stake_delegations/process_delegation.rs b/programs/network/src/jobs/stake_delegations/process_delegation.rs index 32f19b65..4ebc0c15 100644 --- a/programs/network/src/jobs/stake_delegations/process_delegation.rs +++ b/programs/network/src/jobs/stake_delegations/process_delegation.rs @@ -67,7 +67,7 @@ pub fn handler(ctx: Context) -> Result, amount: u64, id: Vec, instruction let thread = &mut ctx.accounts.thread; // Initialize the thread - let bump = *ctx.bumps.get("thread").unwrap(); + let bump = ctx.bumps.thread; thread.authority = authority.key(); thread.bump = bump; thread.created_at = Clock::get().unwrap().into(); diff --git a/programs/thread/v1/Cargo.toml b/programs/thread/v1/Cargo.toml index ac57315e..9407c9d1 100644 --- a/programs/thread/v1/Cargo.toml +++ b/programs/thread/v1/Cargo.toml @@ -18,5 +18,5 @@ no-log-ix-name = [] cpi = ["no-entrypoint"] [dependencies] -anchor-lang = "0.28.0" +anchor-lang = "0.29.0" clockwork-anchor-gen = { version = "0.3.2", features = ["compat-program-result"] } diff --git a/programs/webhook/Cargo.toml b/programs/webhook/Cargo.toml index 0918c6a4..deec7d61 100644 --- a/programs/webhook/Cargo.toml +++ b/programs/webhook/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-webhook-program" -version = "2.0.19" +version = "2.0.20" description = "Clockwork webhook program" edition = "2021" license = "AGPL-3.0-or-later" @@ -22,7 +22,7 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -anchor-lang = { features = ["init-if-needed"], version = "0.28.0" } -clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.19" } -clockwork-utils = { path = "../../utils", version = "=2.0.19" } +anchor-lang = { features = ["init-if-needed"], version = "0.29.0" } +clockwork-network-program = { path = "../network", features = ["cpi"], version = "=2.0.20" } +clockwork-utils = { path = "../../utils", version = "=2.0.20" } serde = "1.0.152" diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index 16a58ac6..e199250a 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-relayer" -version = "2.0.19" +version = "2.0.20" edition = "2021" description = "Clockwork relayer for webhook requests" license = "AGPL-3.0-or-later" @@ -16,18 +16,18 @@ publish = false [dependencies] actix-cors = "0.6.4" actix-web = "4.3.1" -anchor-lang = "0.28.0" +anchor-lang = "0.29.0" byte-unit = "4.0.18" -clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.19" } -clockwork-relayer-api = { path = "api", version = "=2.0.19" } +clockwork-webhook-program = { path = "../programs/webhook", version = "=2.0.20" } +clockwork-relayer-api = { path = "api", version = "=2.0.20" } curve25519-dalek = "3.2.1" lazy_static = "1.4.0" reqwest = "0.11.14" serde = "1.0.152" serde_json = "1.0.94" -solana-client = "=1.16.12" -solana-zk-token-sdk = "=1.16.12" -solana-sdk = "=1.16.12" +solana-client = "^1.16.13" +solana-zk-token-sdk = "^1.16.13" +solana-sdk = "^1.16.13" tokio = "1.26.0" bincode = "1.3.3" rayon = "1.7.0" diff --git a/relayer/api/Cargo.toml b/relayer/api/Cargo.toml index 628399e3..4f935bf9 100644 --- a/relayer/api/Cargo.toml +++ b/relayer/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-relayer-api" -version = "2.0.19" +version = "2.0.20" edition = "2021" description = "Clockwork relayer for webhook requests" license = "AGPL-3.0-or-later" @@ -23,7 +23,7 @@ name = "clockwork_relayer_api" # lazy_static = "1.4.0" serde = "1.0.152" # shadow-drive-sdk = "0.6.1" -# solana-zk-token-sdk = "=1.16.12" -solana-sdk = "=1.16.12" +# solana-zk-token-sdk = "^1.16.13" +solana-sdk = "^1.16.13" # tokio = "1.26.0" bincode = "1.3.3" diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index de74decc..83727bf5 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-sdk" -version = "2.0.19" +version = "2.0.20" description = "An SDK for building automated programs on Solana" edition = "2021" license = "AGPL-3.0-or-later" @@ -14,9 +14,9 @@ keywords = ["solana"] name = "clockwork_sdk" [dependencies] -anchor-lang = "0.28.0" +anchor-lang = "0.29.0" chrono = { version = "0.4.19", default-features = false, features = ["alloc"] } -clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "=2.0.19" } +clockwork-thread-program = { path = "../programs/thread", features = ["cpi"], version = "=2.0.20" } nom = "~7" once_cell = "1.5.2" diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 2ea95d33..c002b663 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clockwork-utils" -version = "2.0.19" +version = "2.0.20" description = "Tools for building blocks on Solana" edition = "2021" license = "AGPL-3.0-or-later" @@ -14,7 +14,7 @@ keywords = ["solana"] name = "clockwork_utils" [dependencies] -anchor-lang = "0.28.0" +anchor-lang = "0.29.0" base64 = "~0.13" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0"