Merge remote-tracking branch 'up/master' into HEAD

ComposableFi · Oct 13, 2023 · 304b680 · 304b680
2 parents 4631aaa + 820b0d7
commit 304b680
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -24,7 +24,7 @@ jobs:
         run: cargo fmt --all --check
 
       - name: Install cargo-deny
-        run: cargo install cargo-deny
+        run: cargo install --locked cargo-deny
 
       - name: Check bans
         run: cargo-deny --all-features check bans

diff --git a/Cargo.toml b/Cargo.toml
@@ -49,6 +49,10 @@ anchor-client = "0.28.0"
 anyhow = "1.0.32"
 
 [patch.crates-io]
-curve25519-dalek = { git = "https://github.com/dhruvja/curve25519-dalek", branch = "master" }
 aes-gcm-siv = { git = "https://github.com/dhruvja/AEADs", branch = "main-aes-gcm-siv-v0.10.3" }
+curve25519-dalek = { git = "https://github.com/dhruvja/curve25519-dalek", branch = "master" }
+
+# eyre has a mutable global variable which is something Solana
+# programs cannot have.  tendermint crate enables eyre; patch it to
+# version that doesn’t do that.
 tendermint = { git = "https://github.com/mina86/tendermint-rs.git", branch = "33.2-sans-eyre" }
diff --git a/common/lib/src/varint.rs b/common/lib/src/varint.rs
@@ -113,6 +113,7 @@ impl borsh::BorshDeserialize for VarInt<u32> {
     }
 }
 
+
 /// Small on-stack buffer.
 ///
 /// # Example
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,6 +113,7 @@ impl borsh::BorshDeserialize for VarInt<u32> { @@
         }
     }
     /// Small on-stack buffer.
     ///
     /// # Example
@@ Expand Down @@