From cb67bb7801a3d149c7bf748ec761e653675ec2d6 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 13:30:05 +0100 Subject: [PATCH 1/7] chore: update osmosis and centauri --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- resources.nix | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index cd93d281..0ad951d6 100644 --- a/flake.lock +++ b/flake.lock @@ -54,17 +54,17 @@ "centauri-src": { "flake": false, "locked": { - "lastModified": 1692209286, - "narHash": "sha256-fabsZyaSCnWnhvG9nO8y39t85u+MZNyEKzU+0fSueLM=", + "lastModified": 1697027127, + "narHash": "sha256-zdEJr4VfwKq20rGx7JZYV7cnz5APwnPSMJrjX9S/bT8=", "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", + "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", "type": "github" }, "original": { "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", + "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", "type": "github" } }, @@ -780,16 +780,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1692886846, - "narHash": "sha256-VdM6hGqcDyCNx7AR8s7SxE3pEMxHiIhCJ7592sDp3uc=", + "lastModified": 1695859760, + "narHash": "sha256-Ad2Z4rzD0HQtnj2aQ4GD6ic5sxOHVPsaW4iNKZEDTiw=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "1c5f25d04f19d6302e0bdd585ba1d7a2cc96e397", + "rev": "38d1d2b748d161fd23f966d88b23b66a63c9a284", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v18.0.0", + "ref": "v19.2.0", "repo": "osmosis", "type": "github" } diff --git a/flake.nix b/flake.nix index d7f0e5a1..ef7a058d 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,7 @@ juno-src.url = github:CosmosContracts/juno/v13.0.1; osmosis-src.flake = false; - osmosis-src.url = github:osmosis-labs/osmosis/v18.0.0; + osmosis-src.url = github:osmosis-labs/osmosis/v19.2.0; sentinel-src.flake = false; sentinel-src.url = github:sentinel-official/hub/v0.9.0-rc0; @@ -134,7 +134,7 @@ # main branch hardcodes some gov addresses owned by private keys # this is one commit patch which allows local governance to work # https://github.com/notional-labs/composable-centauri/pull/199 - centauri-src.url = "github:dzmitry-lahoda-forks/composable-centauri/9fa53d8b47d17219d1270146a146e4e386bc2a29"; + centauri-src.url = "github:dzmitry-lahoda-forks/composable-centauri/9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9"; wasmd-src.flake = false; wasmd-src.url = github:CosmWasm/wasmd/v0.30.0; diff --git a/resources.nix b/resources.nix index b29a0978..faa87fcc 100644 --- a/resources.nix +++ b/resources.nix @@ -109,9 +109,9 @@ osmosis = utilities.mkCosmosGoApp { name = "osmosis"; - version = "v18.0.0"; + version = "v19.2.0"; src = inputs.osmosis-src; - vendorSha256 = "sha256-jeV0ofAMbQihs/OrVZjWSVdXJ8bmrANZ5gZ9JWlWrp4="; + vendorSha256 = "sha256-jeV0ofAMbQihs/OrVZjWSVdXJ1bmrANZ5gZ9JWlWrp4="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "tendermint/tendermint"; @@ -339,9 +339,9 @@ centauri = utilities.mkCosmosGoApp { name = "centauri"; - version = "v4.5.0"; + version = "v6.0.3"; src = inputs.centauri-src; - vendorSha256 = "sha256-RiIRMo6fkiU4XU+OKXrtXUGoFD//hZbbU5qUEc71g6k="; + vendorSha256 = "sha256-RiIRMo1fkiU4XU+OKXrtXUGoFD//hZbbU5qUEc71g6k="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest" "simd"]; From d27ef222d49807b4fc05d00cb256ebaf61dbc75e Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 14:28:49 +0100 Subject: [PATCH 2/7] updated nixpkgs as old failed to build osmosis, make description more broad --- flake.lock | 6 +++--- flake.nix | 2 +- resources.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0ad951d6..4d622b50 100644 --- a/flake.lock +++ b/flake.lock @@ -715,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692684269, - "narHash": "sha256-zJk2pyF4Cuhtor0khtPlf+hfJIh22rzAUC+KU3Ob31Q=", + "lastModified": 1696757521, + "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37", + "rev": "2646b294a146df2781b1ca49092450e8a32814e1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef7a058d..be0a1a9c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A reproducible package set for Cosmos"; + description = "A reproducible package set for Cosmos, IBC and CosmWasm"; inputs = { # Nix Inputs diff --git a/resources.nix b/resources.nix index faa87fcc..8155c2e3 100644 --- a/resources.nix +++ b/resources.nix @@ -111,7 +111,7 @@ name = "osmosis"; version = "v19.2.0"; src = inputs.osmosis-src; - vendorSha256 = "sha256-jeV0ofAMbQihs/OrVZjWSVdXJ1bmrANZ5gZ9JWlWrp4="; + vendorSha256 = "sha256-z1lGckpsrCui8VQow3ciy6yl5LL5NxHMIU+SGL9wvKs="; tags = ["netgo"]; excludedPackages = ["cl-genesis-positions"]; engine = "tendermint/tendermint"; @@ -341,7 +341,7 @@ name = "centauri"; version = "v6.0.3"; src = inputs.centauri-src; - vendorSha256 = "sha256-RiIRMo1fkiU4XU+OKXrtXUGoFD//hZbbU5qUEc71g6k="; + vendorSha256 = "sha256-mNp5FLIw66xvqcv9tqC0cDGLyhRAwP9dTKeRjBx01kE="; tags = ["netgo"]; engine = "cometbft/cometbft"; excludedPackages = ["interchaintest" "simd"]; From fba3cb1290a62870318017fa0198c89e8d0686b0 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 15:14:20 +0100 Subject: [PATCH 3/7] fixed sbt --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4d622b50..0ad951d6 100644 --- a/flake.lock +++ b/flake.lock @@ -715,11 +715,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "lastModified": 1692684269, + "narHash": "sha256-zJk2pyF4Cuhtor0khtPlf+hfJIh22rzAUC+KU3Ob31Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37", "type": "github" }, "original": { From 03ececaad9dee570ce3493def0d2e8d316df14cd Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 15:15:20 +0100 Subject: [PATCH 4/7] fixing sbt --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index be0a1a9c..30e83bdf 100644 --- a/flake.nix +++ b/flake.nix @@ -208,7 +208,7 @@ inherit system; overlays = [ inputs.rust-overlay.overlays.default - inputs.sbt-derivation.overlays.default + inputs.sbt-derivation.overlay.default ]; }; eval-pkgs = import inputs.nixpkgs {system = "x86_64-linux";}; From 85610fab51a521fb1404c7464e5373a8e84d9deb Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 15:16:06 +0100 Subject: [PATCH 5/7] weird is that locally all ok, but flake on this flake fails --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 30e83bdf..be0a1a9c 100644 --- a/flake.nix +++ b/flake.nix @@ -208,7 +208,7 @@ inherit system; overlays = [ inputs.rust-overlay.overlays.default - inputs.sbt-derivation.overlay.default + inputs.sbt-derivation.overlays.default ]; }; eval-pkgs = import inputs.nixpkgs {system = "x86_64-linux";}; From 37439e6b2a59bbf655ec161435f2d514d9ca77df Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 15:18:11 +0100 Subject: [PATCH 6/7] rollback --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 0ad951d6..cd93d281 100644 --- a/flake.lock +++ b/flake.lock @@ -54,17 +54,17 @@ "centauri-src": { "flake": false, "locked": { - "lastModified": 1697027127, - "narHash": "sha256-zdEJr4VfwKq20rGx7JZYV7cnz5APwnPSMJrjX9S/bT8=", + "lastModified": 1692209286, + "narHash": "sha256-fabsZyaSCnWnhvG9nO8y39t85u+MZNyEKzU+0fSueLM=", "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", + "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", "type": "github" }, "original": { "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", + "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", "type": "github" } }, @@ -780,16 +780,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1695859760, - "narHash": "sha256-Ad2Z4rzD0HQtnj2aQ4GD6ic5sxOHVPsaW4iNKZEDTiw=", + "lastModified": 1692886846, + "narHash": "sha256-VdM6hGqcDyCNx7AR8s7SxE3pEMxHiIhCJ7592sDp3uc=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "38d1d2b748d161fd23f966d88b23b66a63c9a284", + "rev": "1c5f25d04f19d6302e0bdd585ba1d7a2cc96e397", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v19.2.0", + "ref": "v18.0.0", "repo": "osmosis", "type": "github" } From fdd55f90c664fed94699a45b01338a10bd5c368e Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Wed, 11 Oct 2023 15:18:45 +0100 Subject: [PATCH 7/7] only deps --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index cd93d281..0ad951d6 100644 --- a/flake.lock +++ b/flake.lock @@ -54,17 +54,17 @@ "centauri-src": { "flake": false, "locked": { - "lastModified": 1692209286, - "narHash": "sha256-fabsZyaSCnWnhvG9nO8y39t85u+MZNyEKzU+0fSueLM=", + "lastModified": 1697027127, + "narHash": "sha256-zdEJr4VfwKq20rGx7JZYV7cnz5APwnPSMJrjX9S/bT8=", "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", + "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", "type": "github" }, "original": { "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", + "rev": "9a296e3dcca3ff390dd5622ab3cfbdfa0b68d2e9", "type": "github" } }, @@ -780,16 +780,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1692886846, - "narHash": "sha256-VdM6hGqcDyCNx7AR8s7SxE3pEMxHiIhCJ7592sDp3uc=", + "lastModified": 1695859760, + "narHash": "sha256-Ad2Z4rzD0HQtnj2aQ4GD6ic5sxOHVPsaW4iNKZEDTiw=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "1c5f25d04f19d6302e0bdd585ba1d7a2cc96e397", + "rev": "38d1d2b748d161fd23f966d88b23b66a63c9a284", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v18.0.0", + "ref": "v19.2.0", "repo": "osmosis", "type": "github" }