add lock

mmsqe · Feb 17, 2024 · 6cb49a5 · 6cb49a5
1 parent 30a4389
commit 6cb49a5
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 38 deletions.
diff --git a/integration_tests/ibc_utils.py b/integration_tests/ibc_utils.py
@@ -627,7 +627,7 @@ def check_channel_ready():
             return False
         return state == target
 
-    wait_for_fn("channel ready", check_channel_ready)
+    wait_for_fn("channel ready", check_channel_ready, timeout=30)
 
 
 def get_next_channel(cli, connid):

diff --git a/integration_tests/install_hermes.nix b/integration_tests/install_hermes.nix
diff --git a/nix/default.nix b/nix/default.nix
@@ -40,7 +40,7 @@ import sources.nixpkgs {
           paths = with pkgs.openssl; [ out dev ];
         };
       };
-      hermes = pkgs.callPackage ../integration_tests/install_hermes.nix { };
+      hermes = pkgs.callPackage ./hermes.nix { src = sources.ibc-rs; };
     })
     (_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; })
     (_: pkgs: {

diff --git a/nix/hermes.nix b/nix/hermes.nix
@@ -0,0 +1,29 @@
+{ src
+, lib
+, stdenv
+, darwin
+, rustPlatform
+, symlinkJoin
+, openssl
+, pkg-config
+}:
+rustPlatform.buildRustPackage rec {
+  name = "hermes";
+  inherit src;
+  cargoBuildFlags = "-p ibc-relayer-cli";
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security pkg-config openssl
+    darwin.libiconv
+    darwin.apple_sdk.frameworks.SystemConfiguration
+  ];
+  cargoLock = {
+    lockFile = "${src}/Cargo.lock";
+  };
+  doCheck = false;
+  RUSTFLAGS = "--cfg ossl111 --cfg ossl110 --cfg ossl101";
+  OPENSSL_NO_VENDOR = "1";
+  OPENSSL_DIR = symlinkJoin {
+    name = "openssl";
+    paths = with openssl; [ out dev ];
+  };
+}
diff --git a/nix/sources.json b/nix/sources.json
@@ -84,6 +84,18 @@
         "url": "https://github.com/crypto-org-chain/gravity-bridge/archive/d984b1562242efab5d7595d4108472ed27eba06f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "ibc-rs": {
+        "branch": "v1.7.0",
+        "description": "IBC modules and relayer - Formal specifications and Rust implementation",
+        "homepage": "",
+        "owner": "informalsystems",
+        "repo": "ibc-rs",
+        "rev": "8e85859fe28da1ee8703084373fd2fc8980faa46",
+        "sha256": "0rh73h5bij83b047713799j8hqai96g4wfns6nsi879z2h2kv69c",
+        "type": "tarball",
+        "url": "https://github.com/informalsystems/hermes/archive/8e85859fe28da1ee8703084373fd2fc8980faa46.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",