diff --git a/flake.lock b/flake.lock index d845d0750b..88e1a7e277 100644 --- a/flake.lock +++ b/flake.lock @@ -655,6 +655,7 @@ "cosmwasm-src": "cosmwasm-src_3", "crescent-src": "crescent-src_3", "cw-plus-src": "cw-plus-src_3", + "dydx-src": "dydx-src", "evmos-src": "evmos-src_3", "flake-parts": "flake-parts_5", "gaia-main-src": "gaia-main-src_3", @@ -724,11 +725,11 @@ "wasmvm_1_beta7-src": "wasmvm_1_beta7-src_3" }, "locked": { - "lastModified": 1703683453, - "narHash": "sha256-uMgdhucQZTNFPa+5v3GXnhFEgXsIIytx16Lp+qI4/tI=", + "lastModified": 1705996063, + "narHash": "sha256-l4MU/4TQtTYGnO1lvSxkSVmLCIWA2nuJK2OkQ1lw1tw=", "owner": "informalsystems", "repo": "cosmos.nix", - "rev": "8429e606fa6b968f6f01752f702b7ba7ce9a9992", + "rev": "ff87fb375ff70c6e90ef022c575c8395575f7345", "type": "github" }, "original": { @@ -740,15 +741,16 @@ "cosmpy-src": { "flake": false, "locked": { - "lastModified": 1701342826, - "narHash": "sha256-WVrPM106r8JwPZbGfeMvmJZirv8MSJpniu496hmzxK4=", + "lastModified": 1691510160, + "narHash": "sha256-vpS5gAeTxw5dnOVBnwWRzWDvTdLv3CMZUq1ta0Te1h8=", "owner": "fetchai", "repo": "cosmpy", - "rev": "e3b67a91d9bb4be5c7da33fb997db2b29e2e18e6", + "rev": "663cff06dadf0db84e81473b27b1e98ccf2da1f5", "type": "github" }, "original": { "owner": "fetchai", + "ref": "v0.9.1", "repo": "cosmpy", "type": "github" } @@ -832,11 +834,11 @@ ] }, "locked": { - "lastModified": 1703439018, - "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", + "lastModified": 1705974079, + "narHash": "sha256-HyC3C2esW57j6bG0MKwX4kQi25ltslRnr6z2uvpadJo=", "owner": "ipetkov", "repo": "crane", - "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", + "rev": "0b4e511fe6e346381e31d355e03de52aa43e8cb2", "type": "github" }, "original": { @@ -934,16 +936,18 @@ "nixpkgs": "nixpkgs_12", "poetry2nix": "poetry2nix", "pydantic-src": "pydantic-src", + "pyscipopt-src": "pyscipopt-src", "rust-overlay": "rust-overlay_2", + "scip": "scip", "scipy-src": "scipy-src", "strictly-typed-pandas-src": "strictly-typed-pandas-src" }, "locked": { - "lastModified": 1704575352, - "narHash": "sha256-XYyyQztrJCxnGGfUk+4tgrcDr2tLVubBEg+fk9y2pwI=", + "lastModified": 1706312337, + "narHash": "sha256-S7MnGyU3XBTqo8pT+jDFikGfvB5DtCSOJwgd7DDr1YY=", "owner": "ComposableFi", "repo": "cvm", - "rev": "075b273cc08fa3656a87a7919cc6d719a6ab70e0", + "rev": "af0e5f9ba5d71aacfd6245b83d583f7b4bb5d3b4", "type": "github" }, "original": { @@ -1023,11 +1027,11 @@ "datamodel-code-generator-src": { "flake": false, "locked": { - "lastModified": 1703650744, - "narHash": "sha256-grotllPFeSs0OJf+B5ocDoULhGqzA7b0osQzUxHq16U=", + "lastModified": 1706205389, + "narHash": "sha256-V9QfXlF7WY8JYdk0N/80lDzOdyEve1WY9DKaK9+Sz4c=", "owner": "koxudaxi", "repo": "datamodel-code-generator", - "rev": "b4533213cb03cebc1b936df7e902e8cbb19e1b35", + "rev": "acc6bf604b13626f22fc123d72ae08ff0a114155", "type": "github" }, "original": { @@ -1044,11 +1048,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1703066966, - "narHash": "sha256-MbX0XYOEvAuXwi80emHKJsjo1IGQZhoKKnEp2uzgNx4=", + "lastModified": 1706018268, + "narHash": "sha256-d24+re0t8b6HYGzAPZCIJed85n23RUFXQa2yuHoW0uQ=", "owner": "cachix", "repo": "devenv", - "rev": "405a4c6a3fecfd2a7fb37cc13f4e760658e522e6", + "rev": "ad0ae333b210e31237e1fc4a7ddab71a01785add", "type": "github" }, "original": { @@ -1132,6 +1136,23 @@ "type": "github" } }, + "dydx-src": { + "flake": false, + "locked": { + "lastModified": 1702405483, + "narHash": "sha256-NiC+Nol8Cye0z/U5cgQ+zhvlbDJX6DouaMo8oYsRGDQ=", + "owner": "dydxprotocol", + "repo": "v4-chain", + "rev": "35b87db422b0ef4138101ba73b0f00d16780ba89", + "type": "github" + }, + "original": { + "owner": "dydxprotocol", + "ref": "protocol/v3.0.0-dev0", + "repo": "v4-chain", + "type": "github" + } + }, "eth-pos-devnet-src": { "flake": false, "locked": { @@ -1153,7 +1174,7 @@ "devour-flake": "devour-flake_2", "devshell": "devshell", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "flake-root": "flake-root", "foundry-nix": "foundry-nix", "lib-extras": "lib-extras", @@ -1329,6 +1350,24 @@ "type": "indirect" } }, + "flake-parts_10": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, + "locked": { + "lastModified": 1678379998, + "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -1405,11 +1444,11 @@ "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -1419,35 +1458,34 @@ }, "flake-parts_7": { "inputs": { - "nixpkgs-lib": [ - "ethereum", - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" + "id": "flake-parts", + "type": "indirect" } }, "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_7" + "nixpkgs-lib": [ + "ethereum", + "nixpkgs" + ] }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -1461,11 +1499,11 @@ "nixpkgs-lib": "nixpkgs-lib_8" }, "locked": { - "lastModified": 1678379998, - "narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=", + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c13d60b89adea3dc20704c045ec4d50dd964d447", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", "type": "github" }, "original": { @@ -3105,16 +3143,16 @@ "ibc-go-v8-channel-upgrade-src_3": { "flake": false, "locked": { - "lastModified": 1695726576, - "narHash": "sha256-mM6h1KAi8lQUrJakxI6f8WI+vpmBhCnAysk3hTZBI7M=", + "lastModified": 1705917317, + "narHash": "sha256-o+dg+AjhzRPKcv+gbIV01qqFfuwsTRDXc2oBG7KuENQ=", "owner": "cosmos", "repo": "ibc-go", - "rev": "63c30108f0ecf954108cf51f50f3d36ec58c7e51", + "rev": "4e3d164e4f9a5986bbe6595138feb49160e27215", "type": "github" }, "original": { "owner": "cosmos", - "ref": "04-channel-upgrades-alpha.0", + "ref": "04-channel-upgrades-hermes-integration.1", "repo": "ibc-go", "type": "github" } @@ -3597,11 +3635,11 @@ "maturin-src": { "flake": false, "locked": { - "lastModified": 1703663878, - "narHash": "sha256-NhLQ9JPBvaoo9tuq7Yg3Y1AB6V+PP7Goq1v7vSwFbyY=", + "lastModified": 1706276521, + "narHash": "sha256-moMw3rHAheN+8yz811R6AU1bh6Q/rUF4WMAZ3J1U8cU=", "owner": "PyO3", "repo": "maturin", - "rev": "a10c623ea838bddb9974b3a0515876ac5909601b", + "rev": "6030857e11c76d1b0c3dc7861893ef18bdef2a13", "type": "github" }, "original": { @@ -3763,11 +3801,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1703173993, - "narHash": "sha256-knmvZLtlEPT0RSdpjPUuzYUL3RDiYhZpKNxNxj6r9Dk=", + "lastModified": 1704799298, + "narHash": "sha256-Kav/28Q9rJCZe++RT8PKYYBcpui39vyCOlHTAQ4xJ/o=", "owner": "ComposableFi", "repo": "networks", - "rev": "2be517f4f57375ba46f77b7adc2ef7a1c6673e46", + "rev": "2c613e032467945ce3d430fb32706383810d9c7f", "type": "github" }, "original": { @@ -4176,11 +4214,11 @@ "nixpkgs-lib_6": { "locked": { "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -4192,6 +4230,24 @@ } }, "nixpkgs-lib_7": { + "locked": { + "dir": "lib", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_8": { "locked": { "dir": "lib", "lastModified": 1688049487, @@ -4209,7 +4265,7 @@ "type": "github" } }, - "nixpkgs-lib_8": { + "nixpkgs-lib_9": { "locked": { "dir": "lib", "lastModified": 1678375444, @@ -4339,16 +4395,16 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "23.11", "repo": "nixpkgs", "type": "github" } @@ -4657,6 +4713,22 @@ "type": "github" } }, + "papilo-src": { + "flake": false, + "locked": { + "lastModified": 1705048944, + "narHash": "sha256-E0J9bQucEoea4xWsEj+cSOB0zbd4Ra28M0HrvUzdHIk=", + "owner": "scipopt", + "repo": "papilo", + "rev": "e0c6df4dc6f6ddea615dba57e38352e592fc8a2a", + "type": "github" + }, + "original": { + "owner": "scipopt", + "repo": "papilo", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils_11", @@ -4669,15 +4741,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1703546497, - "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", + "lastModified": 1702591455, + "narHash": "sha256-vK54IZysaxuUOe+abJO0wD40bxqwfZ2aBOhUWS/O/oA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", + "rev": "9d9d434528404a22fb0c8283fea1ea3a7410ff80", "type": "github" }, "original": { "owner": "nix-community", + "ref": "2023.12.1479959", "repo": "poetry2nix", "type": "github" } @@ -4722,11 +4795,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", "type": "github" }, "original": { @@ -4867,6 +4940,23 @@ "type": "github" } }, + "pyscipopt-src": { + "flake": false, + "locked": { + "lastModified": 1701706375, + "narHash": "sha256-xI5auBByQIA/eb/u1/8u7A0xyZHeRMw3hA+BGTFWf84=", + "owner": "scipopt", + "repo": "PySCIPOpt", + "rev": "0b6bb13db6dd6eafa1ece660dedee11f4c226865", + "type": "github" + }, + "original": { + "owner": "scipopt", + "ref": "v4.4.0", + "repo": "PySCIPOpt", + "type": "github" + } + }, "regen-src": { "flake": false, "locked": { @@ -4982,7 +5072,7 @@ "devenv": "devenv_2", "eth-pos-devnet-src": "eth-pos-devnet-src", "ethereum": "ethereum", - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_9", "flake-utils": "flake-utils_15", "helix": "helix", "home-manager": "home-manager", @@ -5045,11 +5135,11 @@ ] }, "locked": { - "lastModified": 1703815866, - "narHash": "sha256-CFIGDfX1GpNpfKwe/eezKLhgT/oc2VcgjqDTlCLBkJE=", + "lastModified": 1706235145, + "narHash": "sha256-3jh5nahTlcsX6QFcMPqxtLn9p9CgT9RSce5GLqjcpi4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b24e1f369f00f5ae9876e15e12f77e12c9c2374", + "rev": "3a57c4e29cb2beb777b2e6ae7309a680585b8b2f", "type": "github" }, "original": { @@ -5163,6 +5253,32 @@ "type": "github" } }, + "scip": { + "inputs": { + "flake-parts": "flake-parts_7", + "nixpkgs": [ + "cvm", + "nixpkgs" + ], + "papilo-src": "papilo-src", + "soplex-src": "soplex-src", + "suite-src": "suite-src" + }, + "locked": { + "lastModified": 1705788282, + "narHash": "sha256-I763x6ibkjebXStWm5s/iNn9Eoirfrcz0LJaTpYCg0Y=", + "owner": "dzmitry-lahoda-forks", + "repo": "scip", + "rev": "7f083e91574527c8fb788c608e3b47f39217b47b", + "type": "github" + }, + "original": { + "owner": "dzmitry-lahoda-forks", + "repo": "scip", + "rev": "7f083e91574527c8fb788c608e3b47f39217b47b", + "type": "github" + } + }, "scipy-src": { "flake": false, "locked": { @@ -5330,6 +5446,22 @@ "type": "github" } }, + "soplex-src": { + "flake": false, + "locked": { + "lastModified": 1705653601, + "narHash": "sha256-S6f8I2i0MsY2MY/jYymvKvltkfmwMeg0qnRF2jXO0V4=", + "owner": "scipopt", + "repo": "soplex", + "rev": "b10b149cddfd4f5e424c2986e53ce01dd815cdb8", + "type": "github" + }, + "original": { + "owner": "scipopt", + "repo": "soplex", + "type": "github" + } + }, "stargaze-src": { "flake": false, "locked": { @@ -5432,11 +5564,11 @@ "strictly-typed-pandas-src": { "flake": false, "locked": { - "lastModified": 1703785892, - "narHash": "sha256-TiHsDcpq726lUfS6fyEp/8Dt1CaSBcPM2+dmPHNB5Vk=", + "lastModified": 1706293259, + "narHash": "sha256-GLa3vBaJdP4eBwE/9sxmruD7Dj0YoC2aJLR18xQScGM=", "owner": "nanne-aben", "repo": "strictly_typed_pandas", - "rev": "3505d5ea4db8abc63bafb138daf7ebb0dcfc14a3", + "rev": "ab26ddf5585860d9e50b3696f2313386a2d02e98", "type": "github" }, "original": { @@ -5547,6 +5679,18 @@ "type": "github" } }, + "suite-src": { + "flake": false, + "locked": { + "narHash": "sha256-UjEYFcKsfBbBN25xxWFRIdZzenUk2Ooev8lz2eQtzTk=", + "type": "tarball", + "url": "https://scipopt.org/download/release/scipoptsuite-8.1.0.tgz" + }, + "original": { + "type": "tarball", + "url": "https://scipopt.org/download/release/scipoptsuite-8.1.0.tgz" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -6392,7 +6536,7 @@ }, "zombienet": { "inputs": { - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_10", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index b807ac2371..4f11e84305 100644 --- a/flake.nix +++ b/flake.nix @@ -71,7 +71,7 @@ composable-cosmos = { url = "github:ComposableFi/composable-cosmos/release/v7.0.x"; }; - + # update this to update any CVM/MANTIS deps cvm = { url = "github:ComposableFi/cvm"; }; networks = { url = "github:ComposableFi/networks"; };