From 28aff038e78109a833d4e6cafe19bfe7a06de9f5 Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Wed, 30 Oct 2024 11:06:08 +0000 Subject: [PATCH 1/5] chore: switch to rust edition 2021 --- governance/remote_executor/cli/Cargo.toml | 2 +- pythnet/stake_caps_parameters/cli/Cargo.toml | 2 +- target_chains/cosmwasm/contracts/pyth/Cargo.toml | 2 +- target_chains/cosmwasm/examples/cw-contract/Cargo.lock | 4 +++- target_chains/cosmwasm/examples/cw-contract/Cargo.toml | 2 +- target_chains/cosmwasm/sdk/rust/Cargo.toml | 2 +- wormhole_attester/Cargo.lock | 5 ----- wormhole_attester/Cargo.toml | 3 --- wormhole_attester/sdk/rust/Cargo.toml | 2 +- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/governance/remote_executor/cli/Cargo.toml b/governance/remote_executor/cli/Cargo.toml index 572f1aeb4d..533d54728d 100644 --- a/governance/remote_executor/cli/Cargo.toml +++ b/governance/remote_executor/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "remote-executor-cli" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] clap = {version ="3.2.22", features = ["derive"]} diff --git a/pythnet/stake_caps_parameters/cli/Cargo.toml b/pythnet/stake_caps_parameters/cli/Cargo.toml index 353e124873..ff851f55ef 100644 --- a/pythnet/stake_caps_parameters/cli/Cargo.toml +++ b/pythnet/stake_caps_parameters/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "remote-executor-cli" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] clap = {version ="3.2.22", features = ["derive"]} diff --git a/target_chains/cosmwasm/contracts/pyth/Cargo.toml b/target_chains/cosmwasm/contracts/pyth/Cargo.toml index a8516a76a0..84ded862f9 100644 --- a/target_chains/cosmwasm/contracts/pyth/Cargo.toml +++ b/target_chains/cosmwasm/contracts/pyth/Cargo.toml @@ -2,7 +2,7 @@ name = "pyth-cosmwasm" version = "1.3.0" authors = ["Wormhole Contributors "] -edition = "2018" +edition = "2021" description = "Pyth price receiver" [lib] diff --git a/target_chains/cosmwasm/examples/cw-contract/Cargo.lock b/target_chains/cosmwasm/examples/cw-contract/Cargo.lock index 7a8a4c0d3f..7114e933bb 100644 --- a/target_chains/cosmwasm/examples/cw-contract/Cargo.lock +++ b/target_chains/cosmwasm/examples/cw-contract/Cargo.lock @@ -485,7 +485,9 @@ dependencies = [ [[package]] name = "pyth-sdk-cw" -version = "0.1.0" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c04e9f2961bce1ef13b09afcdb5aee7d4ddde83669e5f9d2824ba422cb00de48" dependencies = [ "cosmwasm-schema", "cosmwasm-std", diff --git a/target_chains/cosmwasm/examples/cw-contract/Cargo.toml b/target_chains/cosmwasm/examples/cw-contract/Cargo.toml index 839893e132..1b1f63e68b 100644 --- a/target_chains/cosmwasm/examples/cw-contract/Cargo.toml +++ b/target_chains/cosmwasm/examples/cw-contract/Cargo.toml @@ -2,7 +2,7 @@ name = "example-cw-contract" version = "0.1.0" authors = ["Pyth Data Foundation"] -edition = "2018" +edition = "2021" exclude = [ # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication. diff --git a/target_chains/cosmwasm/sdk/rust/Cargo.toml b/target_chains/cosmwasm/sdk/rust/Cargo.toml index d1584e6b5f..3c28762fb7 100644 --- a/target_chains/cosmwasm/sdk/rust/Cargo.toml +++ b/target_chains/cosmwasm/sdk/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "pyth-sdk-cw" version = "1.2.1" authors = ["Pyth Data Foundation"] -edition = "2018" +edition = "2021" license = "Apache-2.0" homepage = "https://pyth.network" repository = "https://github.com/pyth-network/pyth-crosschain" diff --git a/wormhole_attester/Cargo.lock b/wormhole_attester/Cargo.lock index 3bde7740fc..f39b387743 100644 --- a/wormhole_attester/Cargo.lock +++ b/wormhole_attester/Cargo.lock @@ -1328,8 +1328,3 @@ name = "zeroize" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" - -[[patch.unused]] -name = "serde_wormhole" -version = "0.1.0" -source = "git+https://github.com/wormhole-foundation/wormhole?tag=v2.17.1#3e423a75180f9da69263279e9ffce47b1858ae78" diff --git a/wormhole_attester/Cargo.toml b/wormhole_attester/Cargo.toml index 084de94391..64a08bb72d 100644 --- a/wormhole_attester/Cargo.toml +++ b/wormhole_attester/Cargo.toml @@ -1,5 +1,2 @@ [workspace] members = ["sdk/rust"] - -[patch.crates-io] -serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" } diff --git a/wormhole_attester/sdk/rust/Cargo.toml b/wormhole_attester/sdk/rust/Cargo.toml index e55859e998..d2e87cc385 100644 --- a/wormhole_attester/sdk/rust/Cargo.toml +++ b/wormhole_attester/sdk/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "pyth-wormhole-attester-sdk" version = "0.1.2" authors = ["Wormhole Contributors "] -edition = "2018" +edition = "2021" description = "Pyth to Wormhole SDK" [lib] From fffcd42b598c18d2c0a78920c78ee8670d70075d Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Wed, 30 Oct 2024 16:10:56 +0000 Subject: [PATCH 2/5] chore: transition crates to stable rust, unify version --- .pre-commit-config.yaml | 12 +- apps/fortuna/rust-toolchain | 1 - apps/hermes/server/Cargo.lock | 8 +- apps/hermes/server/rust-toolchain | 2 - apps/hermes/server/src/main.rs | 3 - apps/hermes/server/src/network/pythnet.rs | 2 +- apps/hermes/server/src/network/wormhole.rs | 2 +- apps/hermes/server/src/state/cache.rs | 6 +- governance/remote_executor/Cargo.toml | 1 + .../src/tests/executor_simulator.rs | 5 +- .../src/tests/test_adversarial.rs | 5 +- .../remote_executor/rust-toolchain.toml | 2 - pythnet/message_buffer/Cargo.lock | 334 ++++++++++-------- pythnet/message_buffer/Cargo.toml | 1 + .../programs/message_buffer/Cargo.toml | 1 + pythnet/message_buffer/rust-toolchain.toml | 2 - pythnet/stake_caps_parameters/Cargo.toml | 1 + rust-toolchain.toml | 3 + .../cosmwasm/contracts/pyth/src/contract.rs | 20 +- target_chains/near/rust-toolchain.toml | 2 - target_chains/solana/Cargo.toml | 1 + .../solana/program_simulator/src/lib.rs | 2 +- target_chains/solana/rust-toolchain.toml | 2 - .../starknet/tools/test_vaas/rust-toolchain | 1 - wormhole_attester/Cargo.toml | 1 + 25 files changed, 218 insertions(+), 202 deletions(-) delete mode 100644 apps/fortuna/rust-toolchain delete mode 100644 apps/hermes/server/rust-toolchain delete mode 100644 governance/remote_executor/rust-toolchain.toml delete mode 100644 pythnet/message_buffer/rust-toolchain.toml create mode 100644 rust-toolchain.toml delete mode 100644 target_chains/near/rust-toolchain.toml delete mode 100644 target_chains/solana/rust-toolchain.toml delete mode 100644 target_chains/starknet/tools/test_vaas/rust-toolchain diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a478c50e63..b3d4102304 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: - id: cargo-clippy-remote-executor name: Cargo clippy for remote executor language: "rust" - entry: cargo +nightly-2023-03-01 clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings + entry: cargo clippy --manifest-path ./governance/remote_executor/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings pass_filenames: false files: governance/remote_executor # Hooks for cosmwasm contract @@ -43,7 +43,7 @@ repos: - id: cargo-clippy-cosmwasm name: Cargo clippy for cosmwasm contract language: "rust" - entry: cargo +nightly-2023-03-01 clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings + entry: cargo clippy --manifest-path ./target_chains/cosmwasm/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings pass_filenames: false files: target_chains/cosmwasm # Hooks for Hermes @@ -56,7 +56,7 @@ repos: - id: cargo-clippy-hermes name: Cargo clippy for Hermes language: "rust" - entry: cargo +nightly-2024-03-26 clippy --manifest-path ./apps/hermes/server/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings + entry: cargo clippy --manifest-path ./apps/hermes/server/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings pass_filenames: false files: apps/hermes # Hooks for Fortuna @@ -76,7 +76,7 @@ repos: - id: cargo-clippy-message-buffer name: Cargo clippy for message buffer contract language: "rust" - entry: cargo +nightly-2023-03-01 clippy --manifest-path ./pythnet/message_buffer/Cargo.toml --tests --fix --allow-dirty --allow-staged --features test-bpf -- -D warnings + entry: cargo clippy --manifest-path ./pythnet/message_buffer/Cargo.toml --tests --fix --allow-dirty --allow-staged --features test-bpf -- -D warnings pass_filenames: false files: pythnet/message_buffer # Hooks for pythnet_sdk @@ -89,7 +89,7 @@ repos: - id: cargo-clippy-pythnet-sdk name: Cargo clippy for pythnet SDK language: "rust" - entry: cargo +nightly-2024-08-04 clippy --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings + entry: cargo clippy --manifest-path ./pythnet/pythnet_sdk/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings pass_filenames: false files: pythnet/pythnet_sdk # Hooks for solana receiver contract @@ -102,7 +102,7 @@ repos: - id: cargo-clippy-pyth-solana-receiver name: Cargo clippy for solana target chain contract language: "rust" - entry: cargo +nightly-2023-03-01 clippy --manifest-path ./target_chains/solana/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings + entry: cargo clippy --manifest-path ./target_chains/solana/Cargo.toml --tests --fix --allow-dirty --allow-staged -- -D warnings pass_filenames: false files: target_chains/solana # For express relay python files diff --git a/apps/fortuna/rust-toolchain b/apps/fortuna/rust-toolchain deleted file mode 100644 index f984c0ee0c..0000000000 --- a/apps/fortuna/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2023-07-23 diff --git a/apps/hermes/server/Cargo.lock b/apps/hermes/server/Cargo.lock index 798405fd56..4f115df265 100644 --- a/apps/hermes/server/Cargo.lock +++ b/apps/hermes/server/Cargo.lock @@ -5243,9 +5243,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5264,9 +5264,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/apps/hermes/server/rust-toolchain b/apps/hermes/server/rust-toolchain deleted file mode 100644 index 62d16ee6bd..0000000000 --- a/apps/hermes/server/rust-toolchain +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "nightly-2024-03-26" diff --git a/apps/hermes/server/src/main.rs b/apps/hermes/server/src/main.rs index b43ad1bfba..7e419556a4 100644 --- a/apps/hermes/server/src/main.rs +++ b/apps/hermes/server/src/main.rs @@ -1,6 +1,3 @@ -#![feature(never_type)] -#![feature(btree_cursors)] - use { anyhow::Result, clap::{ diff --git a/apps/hermes/server/src/network/pythnet.rs b/apps/hermes/server/src/network/pythnet.rs index 0762ad20f0..07d8cfae22 100644 --- a/apps/hermes/server/src/network/pythnet.rs +++ b/apps/hermes/server/src/network/pythnet.rs @@ -141,7 +141,7 @@ async fn fetch_bridge_data( } } -pub async fn run(store: Arc, pythnet_ws_endpoint: String) -> Result +pub async fn run(store: Arc, pythnet_ws_endpoint: String) -> Result<()> where S: Aggregates, S: Wormhole, diff --git a/apps/hermes/server/src/network/wormhole.rs b/apps/hermes/server/src/network/wormhole.rs index f8e176cabf..8903d75294 100644 --- a/apps/hermes/server/src/network/wormhole.rs +++ b/apps/hermes/server/src/network/wormhole.rs @@ -140,7 +140,7 @@ where } #[tracing::instrument(skip(opts, state))] -async fn run(opts: RunOptions, state: Arc) -> Result +async fn run(opts: RunOptions, state: Arc) -> Result<()> where S: Wormhole, S: Send + Sync + 'static, diff --git a/apps/hermes/server/src/state/cache.rs b/apps/hermes/server/src/state/cache.rs index cd7ec93a49..076f25aee0 100644 --- a/apps/hermes/server/src/state/cache.rs +++ b/apps/hermes/server/src/state/cache.rs @@ -25,7 +25,6 @@ use { HashMap, HashSet, }, - ops::Bound, sync::Arc, }, strum::IntoEnumIterator, @@ -300,8 +299,8 @@ async fn retrieve_message_state( // Get the first element that is greater than or equal to the lookup time. key_cache - .lower_bound(Bound::Included(&lookup_time)) - .peek_next() + .range(lookup_time..) + .next() .map(|(_, v)| v) .cloned() } @@ -594,7 +593,6 @@ mod test { ); } - #[tokio::test] pub async fn test_store_and_retrieve_first_after_message_state_fails_for_past_time() { // Initialize state with a cache size of 2 per key. diff --git a/governance/remote_executor/Cargo.toml b/governance/remote_executor/Cargo.toml index e53b1958b9..82ad2f6a7b 100644 --- a/governance/remote_executor/Cargo.toml +++ b/governance/remote_executor/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "programs/*", "cli/" diff --git a/governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs b/governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs index 26aff7f94d..3813a14e35 100644 --- a/governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs +++ b/governance/remote_executor/programs/remote-executor/src/tests/executor_simulator.rs @@ -389,10 +389,9 @@ impl From for TransactionError { fn from(val: ExecutorError) -> Self { TransactionError::InstructionError( 0, - InstructionError::try_from(u64::from(ProgramError::from( + InstructionError::from(u64::from(ProgramError::from( anchor_lang::prelude::Error::from(val), - ))) - .unwrap(), + ))), ) } } diff --git a/governance/remote_executor/programs/remote-executor/src/tests/test_adversarial.rs b/governance/remote_executor/programs/remote-executor/src/tests/test_adversarial.rs index 83dc4d433c..60eb46d63f 100644 --- a/governance/remote_executor/programs/remote-executor/src/tests/test_adversarial.rs +++ b/governance/remote_executor/programs/remote-executor/src/tests/test_adversarial.rs @@ -192,10 +192,9 @@ impl IntoTransactionError for ErrorCode { fn into_transation_error(self) -> TransactionError { TransactionError::InstructionError( 0, - InstructionError::try_from(u64::from(ProgramError::from( + InstructionError::from(u64::from(ProgramError::from( anchor_lang::prelude::Error::from(self), - ))) - .unwrap(), + ))), ) } } diff --git a/governance/remote_executor/rust-toolchain.toml b/governance/remote_executor/rust-toolchain.toml deleted file mode 100644 index f701aa5354..0000000000 --- a/governance/remote_executor/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "1.66.1" diff --git a/pythnet/message_buffer/Cargo.lock b/pythnet/message_buffer/Cargo.lock index 66b80c2abe..cfd12aa3d5 100644 --- a/pythnet/message_buffer/Cargo.lock +++ b/pythnet/message_buffer/Cargo.lock @@ -103,8 +103,8 @@ checksum = "2d5e1a413b311b039d29b61d0dbb401c9dbf04f792497ceca87593454bf6d7dd" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "regex", "syn 1.0.109", ] @@ -118,8 +118,8 @@ dependencies = [ "anchor-syn", "anyhow", "bs58 0.4.0", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustversion", "syn 1.0.109", ] @@ -131,7 +131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "788e44f9e8501dabeb6f9229da0f3268fb2ae3208912608ffaa056a72031296f" dependencies = [ "anchor-syn", - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", "syn 1.0.109", ] @@ -142,8 +142,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c4d8c7e4a2605ede6fcdced9690288b2f74e24768619a85229d57e597bc97" dependencies = [ "anchor-syn", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -155,8 +155,8 @@ checksum = "7a3b07d5c5d87b5edc72428b447b8e9ee1143b83dd1afc6a6b1d352c6a6164d8" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -168,8 +168,8 @@ checksum = "b22ad0445115dbea5869b1d062da49ae125abed9132fc20c33227f25e42dfa6b" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -181,8 +181,8 @@ checksum = "48daeff6781ba2f02961b0ad211feb9a2de75af345d42c62b1a252fd4dfb0724" dependencies = [ "anchor-syn", "anyhow", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -192,8 +192,8 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4fe2886f92c4f33ec1b2b8b2b43ca1b9070cf4929e63c7eaaa09a9f2c0d5123" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -229,8 +229,8 @@ dependencies = [ "anyhow", "bs58 0.3.1", "heck 0.3.3", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "serde", "serde_json", "sha2 0.9.9", @@ -317,7 +317,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" dependencies = [ - "quote 1.0.26", + "quote 1.0.37", "syn 1.0.109", ] @@ -329,7 +329,7 @@ checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint 0.4.3", "num-traits", - "quote 1.0.26", + "quote 1.0.37", "syn 1.0.109", ] @@ -390,7 +390,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.36", ] [[package]] @@ -399,8 +399,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "synstructure", ] @@ -411,8 +411,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -462,9 +462,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -473,9 +473,9 @@ version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -608,8 +608,8 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "regex", "rustc-hash", "shlex", @@ -689,7 +689,7 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", "syn 1.0.109", ] @@ -699,8 +699,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -710,8 +710,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -789,8 +789,8 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1195,10 +1195,10 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "scratch", - "syn 2.0.12", + "syn 2.0.85", ] [[package]] @@ -1213,9 +1213,9 @@ version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -1236,8 +1236,8 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", ] @@ -1249,7 +1249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", - "quote 1.0.26", + "quote 1.0.37", "syn 1.0.109", ] @@ -1293,6 +1293,15 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -1305,8 +1314,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1317,8 +1326,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1391,8 +1400,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1467,8 +1476,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4af7804abe0786a9b69375115821fedc9995f21ab63ae285184b96b01ec50b1a" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1508,8 +1517,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1521,8 +1530,8 @@ checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" dependencies = [ "num-bigint 0.4.3", "num-traits", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -1534,8 +1543,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" dependencies = [ "once_cell", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -1754,9 +1763,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -1871,7 +1880,7 @@ dependencies = [ "serde_json", "simpl", "smpl_jwt", - "time 0.3.20", + "time 0.3.36", "tokio", ] @@ -2384,8 +2393,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -2706,6 +2715,7 @@ dependencies = [ "anchor-lang", "bytemuck", "byteorder", + "time 0.3.36", ] [[package]] @@ -2788,8 +2798,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -2907,14 +2917,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -2986,8 +3002,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -3039,9 +3055,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -3115,8 +3131,8 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -3270,9 +3286,9 @@ checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -3311,8 +3327,8 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -3369,6 +3385,12 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3387,7 +3409,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", "syn 1.0.109", ] @@ -3417,8 +3439,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "version_check", ] @@ -3429,8 +3451,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "version_check", ] @@ -3445,9 +3467,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -3522,8 +3544,8 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -3535,8 +3557,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -3638,11 +3660,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", ] [[package]] @@ -3755,7 +3777,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.20", + "time 0.3.36", "yasna", ] @@ -4075,8 +4097,8 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -4149,9 +4171,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.158" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -4167,13 +4189,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -4216,8 +4238,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" dependencies = [ "darling", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -4405,7 +4427,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.3.20", + "time 0.3.36", ] [[package]] @@ -4885,8 +4907,8 @@ version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06395428329810ade1d2518a7e75d8a6f02d01fe548aabb60ff1ba6a2eaebbe5" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -5588,8 +5610,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f809319358d5da7c3a0ac08ebf4d87b21170d928dbb7260254e8f3061f7f9e0e" dependencies = [ "bs58 0.4.0", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustversion", "syn 1.0.109", ] @@ -6122,8 +6144,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "rustversion", "syn 1.0.109", ] @@ -6157,19 +6179,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.12" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "unicode-ident", ] @@ -6185,8 +6207,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "unicode-xid 0.2.4", ] @@ -6255,8 +6277,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -6312,9 +6334,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -6361,11 +6383,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -6373,16 +6398,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -6456,8 +6482,8 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", ] @@ -6664,9 +6690,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" dependencies = [ - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", "prost-build 0.9.0", - "quote 1.0.26", + "quote 1.0.37", "syn 1.0.109", ] @@ -6677,9 +6703,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ "prettyplease", - "proc-macro2 1.0.52", + "proc-macro2 1.0.89", "prost-build 0.11.9", - "quote 1.0.26", + "quote 1.0.37", "syn 1.0.109", ] @@ -6733,9 +6759,9 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", - "syn 2.0.12", + "proc-macro2 1.0.89", + "quote 1.0.37", + "syn 2.0.85", ] [[package]] @@ -7057,8 +7083,8 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "wasm-bindgen-shared", ] @@ -7081,7 +7107,7 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ - "quote 1.0.26", + "quote 1.0.37", "wasm-bindgen-macro-support", ] @@ -7091,8 +7117,8 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -7386,7 +7412,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.20", + "time 0.3.36", ] [[package]] @@ -7404,7 +7430,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.20", + "time 0.3.36", ] [[package]] @@ -7422,8 +7448,8 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ - "proc-macro2 1.0.52", - "quote 1.0.26", + "proc-macro2 1.0.89", + "quote 1.0.37", "syn 1.0.109", "synstructure", ] diff --git a/pythnet/message_buffer/Cargo.toml b/pythnet/message_buffer/Cargo.toml index ef17a63c0a..bcb91f05cb 100644 --- a/pythnet/message_buffer/Cargo.toml +++ b/pythnet/message_buffer/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "programs/*" ] diff --git a/pythnet/message_buffer/programs/message_buffer/Cargo.toml b/pythnet/message_buffer/programs/message_buffer/Cargo.toml index b2a2b3adf4..aabd79c354 100644 --- a/pythnet/message_buffer/programs/message_buffer/Cargo.toml +++ b/pythnet/message_buffer/programs/message_buffer/Cargo.toml @@ -19,6 +19,7 @@ default = [] anchor-lang = { version = "0.27.0" } # needed for the new #[account(zero_copy)] in anchor 0.27.0 bytemuck = { version = "1.4.0", features = ["derive", "min_const_generics"]} +time = "0.3.35" [dev-dependencies] byteorder = "1.4.3" diff --git a/pythnet/message_buffer/rust-toolchain.toml b/pythnet/message_buffer/rust-toolchain.toml deleted file mode 100644 index f701aa5354..0000000000 --- a/pythnet/message_buffer/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "1.66.1" diff --git a/pythnet/stake_caps_parameters/Cargo.toml b/pythnet/stake_caps_parameters/Cargo.toml index 02e9df5bdd..13665bef3a 100644 --- a/pythnet/stake_caps_parameters/Cargo.toml +++ b/pythnet/stake_caps_parameters/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "programs/*", "cli" diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..b9e423b3a9 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.82.0" +components = [ "rustfmt", "rustc-dev", "clippy", "cargo" ] diff --git a/target_chains/cosmwasm/contracts/pyth/src/contract.rs b/target_chains/cosmwasm/contracts/pyth/src/contract.rs index b91a79596f..2b3c0cb67e 100644 --- a/target_chains/cosmwasm/contracts/pyth/src/contract.rs +++ b/target_chains/cosmwasm/contracts/pyth/src/contract.rs @@ -261,7 +261,7 @@ fn update_price_feeds( data: &[Binary], ) -> StdResult> { if !is_fee_sufficient(&deps.as_ref(), info, data)? { - return Err(PythContractError::InsufficientFee)?; + Err(PythContractError::InsufficientFee)?; } let (num_total_attestations, total_new_feeds) = apply_updates(&mut deps, &env, data)?; @@ -308,7 +308,7 @@ fn execute_governance_instruction( // Governance messages must be applied in order. This check prevents replay attacks where // previous messages are re-applied. if vaa.sequence <= state.governance_sequence_number { - return Err(PythContractError::OldGovernanceMessage)?; + Err(PythContractError::OldGovernanceMessage)?; } else { updated_config.governance_sequence_number = vaa.sequence; } @@ -320,13 +320,13 @@ fn execute_governance_instruction( // Check that the instruction is intended for this chain. // chain_id = 0 means the instruction applies to all chains if instruction.target_chain_id != state.chain_id && instruction.target_chain_id != 0 { - return Err(PythContractError::InvalidGovernancePayload)?; + Err(PythContractError::InvalidGovernancePayload)?; } // Check that the instruction is intended for this target chain contract (as opposed to // other Pyth contracts that may live on the same chain). if instruction.module != GovernanceModule::Target { - return Err(PythContractError::InvalidGovernancePayload)?; + Err(PythContractError::InvalidGovernancePayload)?; } let response = match instruction.action { @@ -463,7 +463,7 @@ fn verify_vaa_from_data_source(state: &ConfigInfo, vaa: &ParsedVAA) -> StdResult chain_id: vaa.emitter_chain, }; if !state.data_sources.contains(&vaa_data_source) { - return Err(PythContractError::InvalidUpdateEmitter)?; + Err(PythContractError::InvalidUpdateEmitter)?; } Ok(()) } @@ -475,7 +475,7 @@ fn verify_vaa_from_governance_source(state: &ConfigInfo, vaa: &ParsedVAA) -> Std chain_id: vaa.emitter_chain, }; if state.governance_source != vaa_data_source { - return Err(PythContractError::InvalidUpdateEmitter)?; + Err(PythContractError::InvalidUpdateEmitter)?; } Ok(()) } @@ -533,7 +533,7 @@ fn parse_accumulator(deps: &Deps, env: &Env, data: &[u8]) -> StdResult(&message_vec) @@ -683,7 +683,7 @@ pub fn parse_price_feed_updates( ) -> StdResult> { let _config = config_read(deps.storage).load()?; if !is_fee_sufficient(&deps.as_ref(), info, updates)? { - return Err(PythContractError::InsufficientFee)?; + Err(PythContractError::InsufficientFee)?; } let mut found_feeds = 0; let mut results: Vec<(Identifier, Option)> = @@ -709,7 +709,7 @@ pub fn parse_price_feed_updates( } } if found_feeds != price_feeds.len() { - return Err(PythContractError::InvalidUpdatePayload)?; + Err(PythContractError::InvalidUpdatePayload)?; } let _unwrapped_feeds = results @@ -1894,7 +1894,7 @@ mod test { }) .unwrap(); - let updates = vec![Binary::from([1u8]), Binary::from([2u8])]; + let updates = [Binary::from([1u8]), Binary::from([2u8])]; assert_eq!( get_update_fee(&deps.as_ref(), &updates[0..0]), diff --git a/target_chains/near/rust-toolchain.toml b/target_chains/near/rust-toolchain.toml deleted file mode 100644 index f2415f8315..0000000000 --- a/target_chains/near/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "1.69.0" diff --git a/target_chains/solana/Cargo.toml b/target_chains/solana/Cargo.toml index 0beb7bb636..ec783a9759 100644 --- a/target_chains/solana/Cargo.toml +++ b/target_chains/solana/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "programs/*", "cli/", diff --git a/target_chains/solana/program_simulator/src/lib.rs b/target_chains/solana/program_simulator/src/lib.rs index dfb1c70b92..74a2b46c74 100644 --- a/target_chains/solana/program_simulator/src/lib.rs +++ b/target_chains/solana/program_simulator/src/lib.rs @@ -121,6 +121,6 @@ impl ProgramSimulator { pub fn into_transaction_error>(error: T) -> TransactionError { TransactionError::InstructionError( 0, - InstructionError::try_from(u64::from(ProgramError::from(error.into()))).unwrap(), + InstructionError::from(u64::from(ProgramError::from(error.into()))), ) } diff --git a/target_chains/solana/rust-toolchain.toml b/target_chains/solana/rust-toolchain.toml deleted file mode 100644 index 8142c30126..0000000000 --- a/target_chains/solana/rust-toolchain.toml +++ /dev/null @@ -1,2 +0,0 @@ -[toolchain] -channel = "1.73.0" diff --git a/target_chains/starknet/tools/test_vaas/rust-toolchain b/target_chains/starknet/tools/test_vaas/rust-toolchain deleted file mode 100644 index 54227249d1..0000000000 --- a/target_chains/starknet/tools/test_vaas/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.78.0 diff --git a/wormhole_attester/Cargo.toml b/wormhole_attester/Cargo.toml index 64a08bb72d..0a08bde510 100644 --- a/wormhole_attester/Cargo.toml +++ b/wormhole_attester/Cargo.toml @@ -1,2 +1,3 @@ [workspace] +resolver = "2" members = ["sdk/rust"] From 148cfd96dd7b34e1923c2b97ca62289b60016d45 Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Thu, 31 Oct 2024 10:24:37 +0000 Subject: [PATCH 3/5] chore: update rust toolchain in ci --- .github/workflows/ci-fortuna.yml | 2 +- .github/workflows/ci-hermes-server.yml | 2 +- .github/workflows/ci-message-buffer-idl.yml | 2 +- .github/workflows/ci-pre-commit.yml | 17 +--------------- .github/workflows/ci-remote-executor.yml | 2 +- .github/workflows/ci-starknet-tools.yml | 2 +- .../workflows/publish-pyth-price-store.yml | 2 +- .../publish-pyth-solana-receiver-state.yml | 4 ++-- .../cosmwasm/contracts/pyth/src/contract.rs | 20 +++++++++---------- 9 files changed, 19 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci-fortuna.yml b/.github/workflows/ci-fortuna.yml index bdff0b9d39..762522b773 100644 --- a/.github/workflows/ci-fortuna.yml +++ b/.github/workflows/ci-fortuna.yml @@ -14,7 +14,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2023-07-23 + toolchain: 1.82.0 override: true - name: Run executor tests run: cargo test --manifest-path ./apps/fortuna/Cargo.toml diff --git a/.github/workflows/ci-hermes-server.yml b/.github/workflows/ci-hermes-server.yml index 58312c6799..86a002a8a2 100644 --- a/.github/workflows/ci-hermes-server.yml +++ b/.github/workflows/ci-hermes-server.yml @@ -14,7 +14,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2024-03-26 + toolchain: 1.82.0 components: rustfmt, clippy override: true - name: Install protoc diff --git a/.github/workflows/ci-message-buffer-idl.yml b/.github/workflows/ci-message-buffer-idl.yml index ce86c05c0a..65c58102fe 100644 --- a/.github/workflows/ci-message-buffer-idl.yml +++ b/.github/workflows/ci-message-buffer-idl.yml @@ -21,7 +21,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2023-03-01 + toolchain: 1.82.0 components: rustfmt, clippy - name: Install Solana run: | diff --git a/.github/workflows/ci-pre-commit.yml b/.github/workflows/ci-pre-commit.yml index dbe39baa5b..bd590de8d1 100644 --- a/.github/workflows/ci-pre-commit.yml +++ b/.github/workflows/ci-pre-commit.yml @@ -20,22 +20,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2023-03-01 - components: rustfmt, clippy - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly-2023-07-23 - components: rustfmt, clippy - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly-2024-03-26 - components: rustfmt, clippy - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly-2024-08-04 + toolchain: 1.82.0 components: rustfmt, clippy - name: Install protoc uses: arduino/setup-protoc@v3 diff --git a/.github/workflows/ci-remote-executor.yml b/.github/workflows/ci-remote-executor.yml index 1275c049a6..0258235883 100644 --- a/.github/workflows/ci-remote-executor.yml +++ b/.github/workflows/ci-remote-executor.yml @@ -15,7 +15,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.66.1 + toolchain: 1.82.0 components: rustfmt, clippy override: true - name: Install Solana diff --git a/.github/workflows/ci-starknet-tools.yml b/.github/workflows/ci-starknet-tools.yml index 754ae6c4b4..a08e4fa8bd 100644 --- a/.github/workflows/ci-starknet-tools.yml +++ b/.github/workflows/ci-starknet-tools.yml @@ -14,7 +14,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.78.0 + toolchain: 1.82.0 components: rustfmt, clippy override: true - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-pyth-price-store.yml b/.github/workflows/publish-pyth-price-store.yml index 316cb470cc..111b5bd0a3 100644 --- a/.github/workflows/publish-pyth-price-store.yml +++ b/.github/workflows/publish-pyth-price-store.yml @@ -14,7 +14,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.82.0 default: true profile: minimal - name: Publish diff --git a/.github/workflows/publish-pyth-solana-receiver-state.yml b/.github/workflows/publish-pyth-solana-receiver-state.yml index f85182e5ac..64ab90c190 100644 --- a/.github/workflows/publish-pyth-solana-receiver-state.yml +++ b/.github/workflows/publish-pyth-solana-receiver-state.yml @@ -14,11 +14,11 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.82.0 default: true profile: minimal - - run: cargo +stable-x86_64-unknown-linux-gnu publish --token ${CARGO_REGISTRY_TOKEN} + - run: cargo publish --token ${CARGO_REGISTRY_TOKEN} env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} working-directory: "target_chains/solana/pyth_solana_receiver_sdk" diff --git a/target_chains/cosmwasm/contracts/pyth/src/contract.rs b/target_chains/cosmwasm/contracts/pyth/src/contract.rs index 2b3c0cb67e..b91a79596f 100644 --- a/target_chains/cosmwasm/contracts/pyth/src/contract.rs +++ b/target_chains/cosmwasm/contracts/pyth/src/contract.rs @@ -261,7 +261,7 @@ fn update_price_feeds( data: &[Binary], ) -> StdResult> { if !is_fee_sufficient(&deps.as_ref(), info, data)? { - Err(PythContractError::InsufficientFee)?; + return Err(PythContractError::InsufficientFee)?; } let (num_total_attestations, total_new_feeds) = apply_updates(&mut deps, &env, data)?; @@ -308,7 +308,7 @@ fn execute_governance_instruction( // Governance messages must be applied in order. This check prevents replay attacks where // previous messages are re-applied. if vaa.sequence <= state.governance_sequence_number { - Err(PythContractError::OldGovernanceMessage)?; + return Err(PythContractError::OldGovernanceMessage)?; } else { updated_config.governance_sequence_number = vaa.sequence; } @@ -320,13 +320,13 @@ fn execute_governance_instruction( // Check that the instruction is intended for this chain. // chain_id = 0 means the instruction applies to all chains if instruction.target_chain_id != state.chain_id && instruction.target_chain_id != 0 { - Err(PythContractError::InvalidGovernancePayload)?; + return Err(PythContractError::InvalidGovernancePayload)?; } // Check that the instruction is intended for this target chain contract (as opposed to // other Pyth contracts that may live on the same chain). if instruction.module != GovernanceModule::Target { - Err(PythContractError::InvalidGovernancePayload)?; + return Err(PythContractError::InvalidGovernancePayload)?; } let response = match instruction.action { @@ -463,7 +463,7 @@ fn verify_vaa_from_data_source(state: &ConfigInfo, vaa: &ParsedVAA) -> StdResult chain_id: vaa.emitter_chain, }; if !state.data_sources.contains(&vaa_data_source) { - Err(PythContractError::InvalidUpdateEmitter)?; + return Err(PythContractError::InvalidUpdateEmitter)?; } Ok(()) } @@ -475,7 +475,7 @@ fn verify_vaa_from_governance_source(state: &ConfigInfo, vaa: &ParsedVAA) -> Std chain_id: vaa.emitter_chain, }; if state.governance_source != vaa_data_source { - Err(PythContractError::InvalidUpdateEmitter)?; + return Err(PythContractError::InvalidUpdateEmitter)?; } Ok(()) } @@ -533,7 +533,7 @@ fn parse_accumulator(deps: &Deps, env: &Env, data: &[u8]) -> StdResult(&message_vec) @@ -683,7 +683,7 @@ pub fn parse_price_feed_updates( ) -> StdResult> { let _config = config_read(deps.storage).load()?; if !is_fee_sufficient(&deps.as_ref(), info, updates)? { - Err(PythContractError::InsufficientFee)?; + return Err(PythContractError::InsufficientFee)?; } let mut found_feeds = 0; let mut results: Vec<(Identifier, Option)> = @@ -709,7 +709,7 @@ pub fn parse_price_feed_updates( } } if found_feeds != price_feeds.len() { - Err(PythContractError::InvalidUpdatePayload)?; + return Err(PythContractError::InvalidUpdatePayload)?; } let _unwrapped_feeds = results @@ -1894,7 +1894,7 @@ mod test { }) .unwrap(); - let updates = [Binary::from([1u8]), Binary::from([2u8])]; + let updates = vec![Binary::from([1u8]), Binary::from([2u8])]; assert_eq!( get_update_fee(&deps.as_ref(), &updates[0..0]), From cbaab4ce7d03c553bda9d167d83e826ad9525419 Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Thu, 31 Oct 2024 10:43:29 +0000 Subject: [PATCH 4/5] chore: update time for fortuna --- apps/fortuna/Cargo.lock | 28 +++++++++++++++---- apps/fortuna/src/main.rs | 7 +---- target_chains/near/receiver/Cargo.lock | 2 +- target_chains/near/receiver/workspace-test.sh | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/apps/fortuna/Cargo.lock b/apps/fortuna/Cargo.lock index 901271d74b..99fb6a930a 100644 --- a/apps/fortuna/Cargo.lock +++ b/apps/fortuna/Cargo.lock @@ -876,10 +876,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] @@ -2337,6 +2338,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -2728,6 +2735,12 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3837,12 +3850,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -3856,10 +3871,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/apps/fortuna/src/main.rs b/apps/fortuna/src/main.rs index 60bc0866a5..c09ef12e9c 100644 --- a/apps/fortuna/src/main.rs +++ b/apps/fortuna/src/main.rs @@ -1,11 +1,6 @@ #![allow(clippy::just_underscores_and_digits)] -#![feature(slice_flatten)] -use { - anyhow::Result, - clap::Parser, - std::io::IsTerminal, -}; +use {anyhow::Result, clap::Parser, std::io::IsTerminal}; pub mod api; pub mod chain; diff --git a/target_chains/near/receiver/Cargo.lock b/target_chains/near/receiver/Cargo.lock index 030494df53..512a75ac86 100644 --- a/target_chains/near/receiver/Cargo.lock +++ b/target_chains/near/receiver/Cargo.lock @@ -2298,7 +2298,7 @@ dependencies = [ [[package]] name = "pythnet-sdk" -version = "2.1.0" +version = "2.3.0" dependencies = [ "bincode", "borsh 0.10.3", diff --git a/target_chains/near/receiver/workspace-test.sh b/target_chains/near/receiver/workspace-test.sh index f2ae19b650..493a1326ea 100755 --- a/target_chains/near/receiver/workspace-test.sh +++ b/target_chains/near/receiver/workspace-test.sh @@ -3,7 +3,7 @@ # This script is used to prepare the environment in order to run the NEAR # workspaces based tests. It relies on the relative position of the wormhole- # stub contract to this directory. -set -euo pipefail +set -xeuo pipefail # Setup rust to build wasm. rustup target add wasm32-unknown-unknown From a794fd2b95d87ebfac6ed81fb1b0a9402fc2b290 Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Thu, 31 Oct 2024 11:03:48 +0000 Subject: [PATCH 5/5] chore: fix near ci --- .github/workflows/ci-near-contract.yml | 6 +++++- target_chains/near/receiver/Cargo.lock | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-near-contract.yml b/.github/workflows/ci-near-contract.yml index d97dee85a0..aa43012f5d 100644 --- a/.github/workflows/ci-near-contract.yml +++ b/.github/workflows/ci-near-contract.yml @@ -25,5 +25,9 @@ jobs: - uses: actions/checkout@v2 - name: Install nextest run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin + - name: Install Near Sandbox + run: | + mkdir /tmp/near-sandbox + curl -LsSf https://s3-us-west-1.amazonaws.com/build.nearprotocol.com/nearcore/Linux-x86_64/2.1.1/near-sandbox.tar.gz | tar zxf - -C /tmp/near-sandbox - name: Test - run: ./workspace-test.sh + run: NEAR_SANDBOX_BIN_PATH=/tmp/near-sandbox/Linux-x86_64/near-sandbox ./workspace-test.sh diff --git a/target_chains/near/receiver/Cargo.lock b/target_chains/near/receiver/Cargo.lock index 512a75ac86..a77b1b7198 100644 --- a/target_chains/near/receiver/Cargo.lock +++ b/target_chains/near/receiver/Cargo.lock @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "near-sandbox-utils" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b2da180a368a12da1949e9940af2457cbce83acb85743b8834b6c9b4111e9f" +checksum = "7479b0a2c52890000d410c6e4ba4f851334280530fa7446b78bcaf4683fe69b0" dependencies = [ "anyhow", "async-process",