diff --git a/flake.lock b/flake.lock index 58cc2d1..96bd472 100644 --- a/flake.lock +++ b/flake.lock @@ -1332,16 +1332,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1719537675, - "narHash": "sha256-8Lb2SppNfq3+JwP3uanmCxuCek6tXOO/GcG27XGxRrE=", + "lastModified": 1731942173, + "narHash": "sha256-Ie+LKLrWthkGgJGlVpiTDwBvgA+Mo77Isa65vIOr1Ao=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "b973bffdf127866f45624d7e5a81f31fdc8e8e0b", + "rev": "100ba81036f01a348271ed59917881e2b83d0fbc", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v25.2.0", + "ref": "v27.0.1", "repo": "osmosis", "type": "github" } @@ -1533,7 +1533,8 @@ "wasmvm_2_0_0-src": "wasmvm_2_0_0-src", "wasmvm_2_0_3-src": "wasmvm_2_0_3-src", "wasmvm_2_1_0-src": "wasmvm_2_1_0-src", - "wasmvm_2_1_2-src": "wasmvm_2_1_2-src" + "wasmvm_2_1_2-src": "wasmvm_2_1_2-src", + "wasmvm_2_1_3-src": "wasmvm_2_1_3-src" } }, "rust-overlay": { @@ -2053,6 +2054,23 @@ "repo": "wasmvm", "type": "github" } + }, + "wasmvm_2_1_3-src": { + "flake": false, + "locked": { + "lastModified": 1727089467, + "narHash": "sha256-gYrK2EHhXnearJgLX38O6NLI6TfoGtpzA9be/7S/0ZU=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "2a104d140a5b2974dab7c15044da652769018cbe", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v2.1.3", + "repo": "wasmvm", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4d4ebec..fe77ca8 100644 --- a/flake.nix +++ b/flake.nix @@ -190,7 +190,7 @@ juno-src.url = "github:CosmosContracts/juno/v25.0.0"; juno-src.flake = false; - osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0"; + osmosis-src.url = "github:osmosis-labs/osmosis/v27.0.1"; osmosis-src.flake = false; sentinel-src.url = "github:sentinel-official/hub/v0.9.0-rc0"; @@ -220,6 +220,9 @@ wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0"; wasmvm_1-src.flake = false; + wasmvm_2_1_3-src.url = "github:CosmWasm/wasmvm/v2.1.3"; + wasmvm_2_1_3-src.flake = false; + wasmvm_2_1_2-src.url = "github:CosmWasm/wasmvm/v2.1.2"; wasmvm_2_1_2-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index ea340a7..fa14897 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -119,8 +119,9 @@ }; osmosis = import ../packages/osmosis.nix { inherit (inputs) osmosis-src; - inherit (self'.packages) libwasmvm_1_5_2; + inherit (self'.packages) libwasmvm_2_1_3; inherit cosmosLib; + inherit (pkgs) libiconv; }; osmosis-oci = import ../packages/osmosis-oci.nix { inherit (pkgs) nix2container; diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix index 50ca291..36833fe 100644 --- a/packages/libwasmvm.nix +++ b/packages/libwasmvm.nix @@ -17,6 +17,18 @@ in builtins.mapAttrs (_: libwasmvm: pkgs.rustPlatform.buildRustPackage (libwasmvmCommon // libwasmvm)) { + libwasmvm_2_1_3 = { + src = "${inputs.wasmvm_2_1_3-src}/libwasmvm"; + version = "v2.1.3"; + cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4="; + cargoLock = { + lockFile = "${inputs.wasmvm_2_1_3-src}/libwasmvm/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-2.1.4" = "sha256-stKVEC5jJpZhVCPnoeGApKIgpfV8wd+L5hmrhJy9hsU="; + }; + }; + }; + libwasmvm_2_1_2 = { src = "${inputs.wasmvm_2_1_2-src}/libwasmvm"; version = "v2.1.2"; diff --git a/packages/osmosis.nix b/packages/osmosis.nix index 6853d24..6ee5a6b 100644 --- a/packages/osmosis.nix +++ b/packages/osmosis.nix @@ -1,24 +1,27 @@ { cosmosLib, osmosis-src, - libwasmvm_1_5_2, + libwasmvm_2_1_3, + libiconv, }: cosmosLib.mkCosmosGoApp { name = "osmosis"; - version = "v25.2.0"; - goVersion = "1.21"; + version = "v27.0.1"; + # nixpkgs latest go version v1.22 is v1.22.5 but Osmosis v27.0.1 requires + # v1.22.7 or more so v1.23 is used instead + goVersion = "1.23"; src = osmosis-src; rev = osmosis-src.rev; - vendorHash = "sha256-ZzgAg7Z7cgJir3rfcrQISoT+Ep5UmMY/uVN985UaPYU="; + vendorHash = "sha256-wiEixpZPbnwMdhyNrQvHz3cLZF/GXJRa7ho0YaAnVuc="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "cometbft/cometbft"; preFixup = '' - ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "osmosisd"} - ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "chain"} - ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_2 "node"} + ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "osmosisd"} + ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "chain"} + ${cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_3 "node"} ''; - buildInputs = [libwasmvm_1_5_2]; + buildInputs = [libwasmvm_2_1_3 libiconv]; proxyVendor = true; # Test has to be skipped as end-to-end testing requires network access