comment

draft Update default.nix Update packages.nix Delete packages/datamodel-code-generator.nix Update flake.nix Update default.nix Update flake.nix feat: cw limit size according default cosmos host (informalsystems#188) * cw limit size * fixed profile folder Add Namada chain (informalsystems#193) * WIP: add Namada chain * Update to Namada v0.28.1 * fix broken buildscript for librocksdb-sys * fmt * update broken ics hash --------- Co-authored-by: Jonathan Lorimer <[email protected]> Co-authored-by: Jonathan Lorimer <[email protected]> chore: update osmosis to mainnet release (informalsystems#195) * update osmosis * fixing wasm version Add additional substituters (informalsystems#198) update hermes (informalsystems#197)
dzmitry-lahoda-forks · Mar 15, 2024 · ffbc365 · ffbc365
1 parent 8f8e9cb
commit ffbc365
Show file tree

Hide file tree

Showing 10 changed files with 133 additions and 93 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   nixConfig = {
-    substituters = "https://cosmosnix-store.s3.us-east-2.amazonaws.com";
-    trusted-public-keys = "cosmosnix.store-1:O28HneR1MPtgY3WYruWFuXCimRPwY7em5s0iynkQxdk=";
+    substituters = "https://cosmosnix-store.s3.us-east-2.amazonaws.com https://cache.nixos.org https://nix-community.cachix.org";
+    trusted-public-keys = "cosmosnix.store-1:O28HneR1MPtgY3WYruWFuXCimRPwY7em5s0iynkQxdk= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
   };
 
   description = "A reproducible package set for Cosmos, IBC and CosmWasm";
@@ -42,7 +42,6 @@
     nix-std.url = "github:chessai/nix-std";
     flake-parts.url = "github:hercules-ci/flake-parts";
     gomod2nix.url = "github:JonathanLorimer/gomod2nix/jonathan/update-go";
-    poetry2nix.url = "github:nix-community/poetry2nix";
 
     # Freshautomations inputs
     stoml-src.url = "github:freshautomations/stoml";
@@ -59,7 +58,7 @@
     ibc-rs-src.url = "github:informalsystems/ibc-rs/v1.0.0";
     ibc-rs-src.flake = false;
 
-    hermes-src.url = "github:informalsystems/hermes/v1.6.0";
+    hermes-src.url = "github:informalsystems/hermes/v1.7.4";
     hermes-src.flake = false;
 
     relayer-src.url = "github:cosmos/relayer/v1.0.0";
@@ -144,7 +143,7 @@
     juno-src.url = "github:CosmosContracts/juno/v17.1.1";
     juno-src.flake = false;
 
-    osmosis-src.url = "github:osmosis-labs/osmosis/v20.4.0";
+    osmosis-src.url = "github:osmosis-labs/osmosis/v21.0.0";
     osmosis-src.flake = false;
 
     sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0";
@@ -201,9 +200,6 @@
     wasmvm_1_beta7-src.url = "github:CosmWasm/wasmvm/v1.0.0-beta7";
     wasmvm_1_beta7-src.flake = false;
 
-    cosmwasm-src.url = "github:CosmWasm/cosmwasm/v1.5.0";
-    cosmwasm-src.flake = false;
-
     apalache-src.url = "github:informalsystems/apalache/v0.42.0";
     apalache-src.flake = false;
 
@@ -225,32 +221,28 @@
     celestia-src.url = "github:celestiaorg/celestia-app/v1.4.0";
     celestia-src.flake = false;
 
+    namada-src.url = "github:anoma/namada/v0.28.1";
+    namada-src.flake = false;
+
     neutron-src.url = "github:neutron-org/neutron/v2.0.0";
     neutron-src.flake = false;
 
-    beaker-src.url = "github:osmosis-labs/beaker/v0.1.6";
-    beaker-src.flake = false;
-
     provenance-src.url = "github:/provenance-io/provenance/v1.17.0";
     provenance-src.flake = false;
 
     # Contracts
     cw-plus-src.url = "github:CosmWasm/cw-plus/v1.1.2";
     cw-plus-src.flake = false;
 
+
     # Tools
-    gex-src.url = "github:cosmos/gex/233d335dc9e8c89fb318d1081fae74435f6cac11";
-    gex-src.flake = false;
+    cosmwasm-src.url = "github:CosmWasm/cosmwasm/v1.5.0";
+    cosmwasm-src.flake = false;
 
-    # Python supports (usually for MEV/Trading/AI/Indexing)
-    datamodel-code-generator-src = {
-      url = "github:koxudaxi/datamodel-code-generator";
-      flake = false;
-    };
+    beaker-src.url = "github:osmosis-labs/beaker/v0.1.6";
+    beaker-src.flake = false;
 
-    cosmpy-src = {
-      url = "github:fetchai/cosmpy";
-      flake = false;
-    };
+    gex-src.url = "github:cosmos/gex/233d335dc9e8c89fb318d1081fae74435f6cac11";
+    gex-src.flake = false;
   };
 }
diff --git a/lib/default.nix b/lib/default.nix
@@ -25,6 +25,8 @@ nix-std: {
       # people use different profiles a lot
       profile ? "release",
       nativeBuildInputs ? [],
+      # as per https://github.com/CosmWasm/wasmd/blob/main/README.md
+      maxWasmSizeBytes ? 819200,
       ...
     }: let
       binaryName = "${builtins.replaceStrings ["-"] ["_"] pname}.wasm";
@@ -45,12 +47,18 @@ nix-std: {
           buildPhase = ''
             cargo build --lib --target ${target} --profile ${profile} --package ${pname}
             mkdir -p ./output/lib
-            wasm-opt "target/${target}/release/${binaryName}" -o  "./output/lib/${binaryName}" -Os --signext-lowering
+            wasm-opt "target/${target}/${profile}/${binaryName}" -o  "./output/lib/${binaryName}" -Os --signext-lowering
             cp -r ./output $out
           '';
           checkPhase = ''
             cargo test
             cosmwasm-check "$out/lib/${binaryName}"
+            SIZE=$(stat --format=%s "$out/lib/${binaryName}")
+            if [[ "$SIZE" -gt ${builtins.toString maxWasmSizeBytes} ]]; then
+              echo "Wasm file size is $SIZE, which is larger than the maximum allowed size of ${builtins.toString maxWasmSizeBytes} bytes."
+              echo "Either reduce size or increase maxWasmSizeBytes if you know what you are doing."
+              exit 1
+            fi
           '';
         }
         // cleanedArgs
@@ -131,14 +139,6 @@ nix-std: {
 in {
   inherit buildCosmwasmContract;
   mkCosmosGoApp = buildApp;
-  cosmpy-package = let
-    inherit (inputs.poetry2nix.lib.mkPoetry2Nix {inherit pkgs;}) mkPoetryPackages;
-  in
-    (mkPoetryPackages {
-      projectDir = inputs.cosmpy-src;
-      checkGroups = [];
-    })
-    .poetryPackages;
 
   wasmdPreFixupPhase = libwasmvm: binName:
     if pkgs.stdenv.hostPlatform.isLinux

diff --git a/modules/apps.nix b/modules/apps.nix
@@ -188,6 +188,10 @@
         type = "app";
         program = "${packages.provenance}/bin/provenanced";
       };
+      namada = {
+        type = "app";
+        program = "${packages.namada}/bin/namada";
+      };
     };
   };
 }
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -43,13 +43,6 @@
           inherit pkgs;
           inherit (inputs) cosmwasm-src;
         };
-        datamodel-code-generator = let
-          inherit (inputs.poetry2nix.lib.mkPoetry2Nix {inherit pkgs;}) mkPoetryApplication;
-        in
-          import ../packages/datamodel-code-generator.nix {
-            inherit mkPoetryApplication;
-            inherit (inputs) datamodel-code-generator-src;
-          };
         cosmovisor = import ../packages/cosmovisor.nix {
           inherit (pkgs) buildGoModule;
           inherit (inputs) cosmos-sdk-src;
@@ -104,7 +97,7 @@
         };
         osmosis = import ../packages/osmosis.nix {
           inherit (inputs) osmosis-src;
-          inherit (self'.packages) libwasmvm_1_2_3;
+          inherit (self'.packages) libwasmvm_1_5_0;
           inherit cosmosLib;
         };
         provenance = import ../packages/provenance.nix {
@@ -151,6 +144,10 @@
           inherit (self'.packages) libwasmvm_1_2_3;
           inherit cosmosLib;
         };
+        namada = import ../packages/namada.nix {
+          inherit pkgs;
+          inherit (inputs) namada-src;
+        };
       }
       # This list contains attr sets that are recursively merged into the
       # base attrset

diff --git a/packages/datamodel-code-generator.nix b/packages/datamodel-code-generator.nix
diff --git a/packages/hermes.nix b/packages/hermes.nix
@@ -4,10 +4,9 @@
 }:
 pkgs.rustPlatform.buildRustPackage {
   pname = "hermes";
-  version = "v1.6.0";
+  version = "v1.7.4";
   src = hermes-src;
   nativeBuildInputs = with pkgs; [rust-bin.stable.latest.default] ++ lib.lists.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.Security];
-  cargoSha256 = "sha256-xCSH8L8do6mS3NKPBZoXKrbJizEDiCJrZnUeG0aisRE=";
+  cargoSha256 = "sha256-oAsRn0THb5FU1HqgpB60jChGeQZdbrPoPfzTbyt3ozM=";
   doCheck = false;
-  cargoCheckCommand = "true";
 }
diff --git a/packages/interchain-security.nix b/packages/interchain-security.nix
@@ -7,7 +7,7 @@ mkCosmosGoApp {
   appName = "interchain-security";
   version = "v3.0.0-pre";
   src = interchain-security-src;
-  vendorHash = "sha256-TnU7lJnoD/ZzPS2XfvFGkb/ycLbH3iHvKRim+31+Yro=";
+  vendorHash = "sha256-j0xus8vN6bnFMUXyvT8r7ONPQyaEBydKQ8qH2BevWPs=";
   tags = ["netgo"];
   engine = "cometbft/cometbft";
   doCheck = false; # tests are currently failing