diff --git a/flake.lock b/flake.lock index 09cf961a..09648dbd 100644 --- a/flake.lock +++ b/flake.lock @@ -1511,7 +1511,8 @@ "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", - "wasmvm_2_1_0-src": "wasmvm_2_1_0-src" + "wasmvm_2_1_0-src": "wasmvm_2_1_0-src", + "wasmvm_2_1_2-src": "wasmvm_2_1_2-src" } }, "rust-overlay": { @@ -1754,16 +1755,16 @@ "wasmd-src": { "flake": false, "locked": { - "lastModified": 1720696698, - "narHash": "sha256-b2u3PWtjZAgmTdm/b3UcGn9K9qVQj9DR4FMcqg67T1w=", + "lastModified": 1724231006, + "narHash": "sha256-X8Q93gqk+gBJwn4EIxFVeWqRpHcIxNAplfARejHwfbk=", "owner": "CosmWasm", "repo": "wasmd", - "rev": "1ff818801d4aa5dd6f483571ac7a38660c59c671", + "rev": "de7db0dc672e7beb201e06e7eb12b2de356ac7c9", "type": "github" }, "original": { "owner": "CosmWasm", - "ref": "v0.52.0", + "ref": "v0.53.0", "repo": "wasmd", "type": "github" } @@ -1997,6 +1998,23 @@ "repo": "wasmvm", "type": "github" } + }, + "wasmvm_2_1_2-src": { + "flake": false, + "locked": { + "lastModified": 1723135029, + "narHash": "sha256-Y3BVRR2T5MLOtXdPK38W8MX8etIuqGcTjvxkaEOyvVM=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "d8f06b73e4d49f8246e1569f032962122427882b", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v2.1.2", + "repo": "wasmvm", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c09ae8f1..b4fa00bd 100644 --- a/flake.nix +++ b/flake.nix @@ -211,12 +211,15 @@ composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88"; composable-cosmos-src.flake = false; - wasmd-src.url = "github:CosmWasm/wasmd/v0.52.0"; + wasmd-src.url = "github:CosmWasm/wasmd/v0.53.0"; wasmd-src.flake = false; wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0"; wasmvm_1-src.flake = false; + wasmvm_2_1_2-src.url = "github:CosmWasm/wasmvm/v2.1.2"; + wasmvm_2_1_2-src.flake = false; + wasmvm_2_1_0-src.url = "github:CosmWasm/wasmvm/v2.1.0"; wasmvm_2_1_0-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index 5b4ed228..2cd69423 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -161,7 +161,7 @@ }; wasmd = import ../packages/wasmd.nix { inherit (inputs) wasmd-src; - inherit (self'.packages) libwasmvm_2_1_0; + inherit (self'.packages) libwasmvm_2_1_2; inherit cosmosLib; }; rollapp-evm = import ../packages/rollapp-evm.nix { diff --git a/packages/libwasmvm.nix b/packages/libwasmvm.nix index fa21a0d8..d553733a 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_2 = { + src = "${inputs.wasmvm_2_1_2-src}/libwasmvm"; + version = "v2.1.2"; + cargoSha256 = "sha256-BFou131HI+YKXU9H51Xa/y7A441Z7QkAA92mhquJ5l4="; + cargoLock = { + lockFile = "${inputs.wasmvm_2_1_2-src}/libwasmvm/Cargo.lock"; + outputHashes = { + "cosmwasm-crypto-2.1.3" = "sha256-WXhz47cNeSRlUGfiXZkGOvu6WjK26MPJB716DiFqYPY="; + }; + }; + }; + libwasmvm_2_1_0 = { src = "${inputs.wasmvm_2_1_0-src}/libwasmvm"; version = "v2.1.0"; diff --git a/packages/wasmd.nix b/packages/wasmd.nix index e69080c4..6c055263 100644 --- a/packages/wasmd.nix +++ b/packages/wasmd.nix @@ -1,20 +1,20 @@ { wasmd-src, cosmosLib, - libwasmvm_2_1_0, + libwasmvm_2_1_2, }: cosmosLib.mkCosmosGoApp { name = "wasm"; - version = "v0.52.0"; + version = "v0.53.0"; goVersion = "1.21"; src = wasmd-src; rev = wasmd-src.rev; - vendorHash = "sha256-G4SujfIKNlfGUr7mM9C/iXd0Xc0/wEl6tJB02TufeiI="; + vendorHash = "sha256-rhuYWhaTtrHCeO9l4uiP7L2OmWkCPtMHXBqS7TRzM4s="; tags = ["netgo"]; engine = "cometbft/cometbft"; - preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_0 "wasmd"; + preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_2_1_2 "wasmd"; dontStrip = true; - buildInputs = [libwasmvm_2_1_0]; + buildInputs = [libwasmvm_2_1_2]; # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system excludedPackages = ["tests/system"];