From 03dc4d2320ec585d4f4f36f705795c184407e771 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Fri, 13 Oct 2023 06:05:49 +0200 Subject: [PATCH 1/2] github: fix cargo-deny build failure in CI Use --locked when installing cargo-deny to fix build failure caused by duplicate dependency: error[E0308]: `?` operator has incompatible types --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/gix-0.54.1/src/repository/config/transport.rs:272:47 272 | opts.proxy_authenticate = opts | _______________________________________________^ ... | 288 | | .transpose()?; | |_____________________________________^ expected `gix_credentials::helper::Action`, found a different `gix_credentials::helper::Action` | = note: `?` operator cannot convert from `Option<(gix_credentials::helper::Action, Arc<_>)>` to `Option<(gix_credentials::helper::Action, Arc<_>)>` = note: `gix_credentials::helper::Action` and `gix_credentials::helper::Action` have similar names, but are actually distinct types = note: perhaps two different versions of crate `gix_credentials` are being used? --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b9ffdf8c..ddafa227 100644 --- 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 From 820b0d7e57a012d8b41bd1c019f8326d4b758b96 Mon Sep 17 00:00:00 2001 From: Michal Nazarewicz Date: Fri, 13 Oct 2023 13:49:25 +0200 Subject: [PATCH 2/2] solana-ibc: patch tendermint dependency to disable eyre (#25) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Solana programs cannot have any mutable static variables. Unfortunately, eyre which is enabled by tendermint enables eyre dependency leading to programs which cannot be compiled for Solana. Patch tendermint with a version that doesn’t enable eyre. --- Cargo.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8689dbfc..ff707ef3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,5 +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" }