diff --git a/flake.lock b/flake.lock index 09648db..19b9636 100644 --- a/flake.lock +++ b/flake.lock @@ -1049,16 +1049,16 @@ "juno-src": { "flake": false, "locked": { - "lastModified": 1724278445, - "narHash": "sha256-XvJqp36HSYqm6OMLQqJPX5sCT52GxSLFDMO+fJovh+0=", + "lastModified": 1727102451, + "narHash": "sha256-UaTCcK+I6Wl4yCpbNckx+lRi55kTSucJxzw5irJOVh4=", "owner": "CosmosContracts", "repo": "juno", - "rev": "2f119adacca3a1668ff150c225a3f423501e748c", + "rev": "de3c4d145c7a96c31e3fca6fe8850ce4ab559e33", "type": "github" }, "original": { "owner": "CosmosContracts", - "ref": "v24.0.0", + "ref": "v25.0.0", "repo": "juno", "type": "github" } @@ -1508,6 +1508,7 @@ "wasmvm_1_5_0-src": "wasmvm_1_5_0-src", "wasmvm_1_5_2-src": "wasmvm_1_5_2-src", "wasmvm_1_5_4-src": "wasmvm_1_5_4-src", + "wasmvm_1_5_5-src": "wasmvm_1_5_5-src", "wasmvm_1_beta7-src": "wasmvm_1_beta7-src", "wasmvm_2_0_0-src": "wasmvm_2_0_0-src", "wasmvm_2_0_3-src": "wasmvm_2_0_3-src", @@ -1932,6 +1933,23 @@ "type": "github" } }, + "wasmvm_1_5_5-src": { + "flake": false, + "locked": { + "lastModified": 1727088523, + "narHash": "sha256-ysS2pMMm+s1JsHVv9RhiMHt5g4UGcE5jqOI5YKdC4vU=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "0c5b9ce8446189f07d2bf65fbb902817cf57a563", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v1.5.5", + "repo": "wasmvm", + "type": "github" + } + }, "wasmvm_1_beta7-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index b4fa00b..e4736e3 100644 --- a/flake.nix +++ b/flake.nix @@ -184,7 +184,7 @@ evmos-src.url = "github:evmos/evmos/v16.0.0-rc4"; evmos-src.flake = false; - juno-src.url = "github:CosmosContracts/juno/v24.0.0"; + juno-src.url = "github:CosmosContracts/juno/v25.0.0"; juno-src.flake = false; osmosis-src.url = "github:osmosis-labs/osmosis/v25.2.0"; @@ -229,6 +229,9 @@ wasmvm_2_0_0-src.url = "github:CosmWasm/wasmvm/v2.0.0"; wasmvm_2_0_0-src.flake = false; + wasmvm_1_5_5-src.url = "github:CosmWasm/wasmvm/v1.5.5"; + wasmvm_1_5_5-src.flake = false; + wasmvm_1_5_4-src.url = "github:CosmWasm/wasmvm/v1.5.4"; wasmvm_1_5_4-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index 2cd6942..0fb3d67 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -99,7 +99,7 @@ }; juno = import ../packages/juno.nix { inherit (inputs) juno-src; - inherit (self'.packages) libwasmvm_1_5_4; + inherit (self'.packages) libwasmvm_1_5_5; inherit cosmosLib; }; migaloo = import ../packages/migaloo.nix { diff --git a/packages/juno.nix b/packages/juno.nix index 20af967..a345d34 100644 --- a/packages/juno.nix +++ b/packages/juno.nix @@ -1,21 +1,21 @@ { cosmosLib, juno-src, - libwasmvm_1_5_4, + libwasmvm_1_5_5, }: cosmosLib.mkCosmosGoApp { name = "juno"; - version = "v24.0.0"; + version = "v25.0.0"; goVersion = "1.22"; src = juno-src; rev = juno-src.rev; - vendorHash = "sha256-srBwnVyOx6Zt6n2e6WhZd+uHWNnpyv6fQTi1A9jsVd0="; + vendorHash = "sha256-HDHsBuuJ+ta3ynYv8NVqEdd0h4UNWBelUA8j+YoEf4E="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest"]; preFixup = '' - ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_4 "junod"} + ${cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_5 "junod"} ''; dontStrip = true; - buildInputs = [libwasmvm_1_5_4]; + buildInputs = [libwasmvm_1_5_5]; } diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix index d553733..50ca291 100644 --- a/packages/libwasmvm.nix +++ b/packages/libwasmvm.nix @@ -65,6 +65,18 @@ in }; }; + libwasmvm_1_5_5 = { + src = "${inputs.wasmvm_1_5_5-src}/libwasmvm"; + version = "v1.5.5"; + cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4="; + cargoLock = { + lockFile = "${inputs.wasmvm_1_5_5-src}/libwasmvm/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-1.5.8" = "sha256-H5PXdAInZIgzkAUQlqXp7KSQhgy3mGN5WQeumRKoNc4="; + }; + }; + }; + libwasmvm_1_5_4 = { src = "${inputs.wasmvm_1_5_4-src}/libwasmvm"; version = "v1.5.4";