diff --git a/flake.lock b/flake.lock index ffc36a4..16751f8 100644 --- a/flake.lock +++ b/flake.lock @@ -1395,7 +1395,6 @@ "stride-src": "stride-src", "umee-src": "umee-src", "wasmd-src": "wasmd-src", - "wasmd_next-src": "wasmd_next-src", "wasmvm_1-src": "wasmvm_1-src", "wasmvm_1_1_1-src": "wasmvm_1_1_1-src", "wasmvm_1_1_2-src": "wasmvm_1_1_2-src", @@ -1647,31 +1646,16 @@ "wasmd-src": { "flake": false, "locked": { - "narHash": "sha256-F0p555FEeA405tuLn82yUEbRZpJLs85GrUKvSrjTdjk=", + "lastModified": 1700749637, + "narHash": "sha256-rKbuaWcRdHXSI+acHrx/hCdGOx5prPd+Dmng4BVrhzs=", "owner": "CosmWasm", "repo": "wasmd", - "rev": "a347ace2ff41539fe06c68168bc6f28d6ca9fa52", + "rev": "7ea00e2ea858ed599141e322bd68171998a3259a", "type": "github" }, "original": { "owner": "CosmWasm", - "ref": "v0.30.0", - "repo": "wasmd", - "type": "github" - } - }, - "wasmd_next-src": { - "flake": false, - "locked": { - "narHash": "sha256-b+6XhBdKyQlrzsYxVRrDf4vHpv8GAJkGwHVfJ9sdf3U=", - "owner": "CosmWasm", - "repo": "wasmd", - "rev": "c2bb27d289f7f72f1471a4b33cb08fdfc8d66f63", - "type": "github" - }, - "original": { - "owner": "CosmWasm", - "ref": "v0.40.0-rc.1", + "ref": "v0.50.0", "repo": "wasmd", "type": "github" } diff --git a/flake.nix b/flake.nix index f146345..b843c38 100644 --- a/flake.nix +++ b/flake.nix @@ -179,12 +179,9 @@ composable-cosmos-src.url = "github:ComposableFi/composable-cosmos/v6.4.88"; composable-cosmos-src.flake = false; - wasmd-src.url = "github:CosmWasm/wasmd/v0.30.0"; + wasmd-src.url = "github:CosmWasm/wasmd/v0.50.0"; wasmd-src.flake = false; - wasmd_next-src.url = "github:CosmWasm/wasmd/v0.40.0-rc.1"; - wasmd_next-src.flake = false; - wasmvm_1-src.url = "github:CosmWasm/wasmvm/v1.0.0"; wasmvm_1-src.flake = false; diff --git a/modules/packages.nix b/modules/packages.nix index a47ee42..b805037 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -166,12 +166,7 @@ }; wasmd = import ../packages/wasmd.nix { inherit (inputs) wasmd-src; - inherit (self'.packages) libwasmvm_1_1_1; - inherit cosmosLib; - }; - wasmd_next = import ../packages/wasmd_next.nix { - inherit (inputs) wasmd_next-src; - inherit (self'.packages) libwasmvm_1_2_3; + inherit (self'.packages) libwasmvm_1_5_0; inherit cosmosLib; }; rollapp-evm = import ../packages/rollapp-evm.nix { diff --git a/packages/wasmd.nix b/packages/wasmd.nix index 855beaa..6ecdff8 100644 --- a/packages/wasmd.nix +++ b/packages/wasmd.nix @@ -1,17 +1,23 @@ { wasmd-src, cosmosLib, - libwasmvm_1_1_1, + libwasmvm_1_5_0, }: cosmosLib.mkCosmosGoApp { name = "wasm"; - version = "v0.30.0"; + version = "v0.50.0"; + goVersion = "1.21"; src = wasmd-src; rev = wasmd-src.rev; - vendorHash = "sha256-8Uo/3SdXwblt87WU78gjpRPcHy+ZotmhF6xTyb3Jxe0"; + vendorHash = "sha256-IS+WupPaOZgx1iJTHKbX8r6z3/9TsWamTEZCJbVpCOg="; tags = ["netgo"]; - engine = "tendermint/tendermint"; - preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_1_1 "wasmd"; + engine = "cometbft/cometbft"; + preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_5_0 "wasmd"; dontStrip = true; - buildInputs = [libwasmvm_1_1_1]; + buildInputs = [libwasmvm_1_5_0]; + + # main module (github.com/CosmWasm/wasmd) does not contain package github.com/CosmWasm/wasmd/tests/system + excludedPackages = ["tests/system"]; + + doCheck = false; } diff --git a/packages/wasmd_next.nix b/packages/wasmd_next.nix deleted file mode 100644 index 589d5fe..0000000 --- a/packages/wasmd_next.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - wasmd_next-src, - cosmosLib, - libwasmvm_1_2_3, -}: -cosmosLib.mkCosmosGoApp { - name = "wasm"; - version = "v0.40.0-rc.1"; - src = wasmd_next-src; - rev = wasmd_next-src.rev; - vendorHash = "sha256-FWpclJuuIkbcoXxRTeZwDR0wZP2eHkPKsu7xme5vLPg="; - tags = ["netgo"]; - engine = "cometbft/cometbft"; - preFixup = cosmosLib.wasmdPreFixupPhase libwasmvm_1_2_3 "wasmd"; - dontStrip = true; - buildInputs = [libwasmvm_1_2_3]; -}