From 5bee8dc074044a0e3ea907a3442a9fe70e87003f Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 15:18:01 +0000 Subject: [PATCH 01/23] cvm releasing --- flake/devnets/cosmos.nix | 314 ++++++++++++++++++ .../flake-module.nix} | 0 2 files changed, 314 insertions(+) create mode 100644 flake/devnets/cosmos.nix rename flake/{process-compose.nix => devnets/flake-module.nix} (100%) diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix new file mode 100644 index 0000000000..347d89afc7 --- /dev/null +++ b/flake/devnets/cosmos.nix @@ -0,0 +1,314 @@ + devnet-cosmos = { + settings = { + log_level = "trace"; + log_location = "/tmp/composable-devnet/pc.log"; + processes = { + centauri = { + command = self'.packages.centaurid-gen; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = 26657; + }; + log_location = "${devnet-root-directory}/centauri.log"; + availability = { restart = chain-restart; }; + }; + + neutron-init = { + command = self'.packages.neutron-gen; + log_location = "${devnet-root-directory}/neutron-init.log"; + availability = { restart = chain-restart; }; + }; + + neutron = { + command = self'.packages.neutron-start; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = networks.neutron.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/neutron-start.log"; + availability = { restart = chain-restart; }; + depends_on."neutron-init".condition = + "process_completed_successfully"; + }; + + cosmos-hub-init = { + command = self'.packages.cosmos-hub-gen; + log_location = "${devnet-root-directory}/cosmos-hub-init.log"; + availability = { restart = chain-restart; }; + namespace = "full-node"; + }; + + cosmos-hub = { + command = self'.packages.cosmos-hub-start; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = networks.cosmos-hub.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/cosmos-hub-start.log"; + availability = { restart = chain-restart; }; + depends_on."cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "full-node"; + }; + + neutron-cosmos-hub-init = { + command = self'.packages.neutron-cosmos-hub-hermes-init; + log_location = + "${devnet-root-directory}/neutron-cosmos-hub-init.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + namespace = "trustless-relay"; + }; + + cosmos-hub-neutron-relay = { + command = self'.packages.neutron-cosmos-hub-hermes-relay; + log_location = + "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."neutron-cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; + + centauri-neutron-init = { + command = self'.packages.neutron-centauri-hermes-init; + log_location = + "${devnet-root-directory}/centauri-neutron-init.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."osmosis-centauri-init".condition = + "process_completed_successfully"; + depends_on."neutron-cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; + + centauri-cosmos-hub-init = { + command = self'.packages.centauri-cosmos-hub-hermes-init; + log_location = + "${devnet-root-directory}/centauri-cosmos-hub-init.log"; + availability = { restart = relay; }; + depends_on."centauri".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."centauri-neutron-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; + + centauri-cosmos-hub-relay = { + command = self'.packages.centauri-cosmos-hub-hermes-relay; + log_location = + "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; + availability = { restart = relay; }; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."cosmos-hub-centauri-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; + + centauri-neutron-relay = { + command = self'.packages.centauri-neutron-hermes-relay; + log_location = + "${devnet-root-directory}/neutron-centauri-relay.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."neutron-centauri-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; + + centauri-init = { + command = self'.packages.centaurid-init; + depends_on."centauri".condition = "process_healthy"; + log_location = "${devnet-root-directory}/centauri-init.log"; + availability = { restart = chain-restart; }; + }; + + centauri-cvm-init = { + command = self'.packages.centaurid-cvm-init; + depends_on."centauri".condition = "process_healthy"; + log_location = "${devnet-root-directory}/centauri-cvm-init.log"; + availability = { restart = chain-restart; }; + }; + + centauri-cvm-config = { + command = self'.packages.centaurid-cvm-config; + depends_on."centauri-cvm-init".condition = + "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = + "process_completed_successfully"; + log_location = + "${devnet-root-directory}/centauri-cvm-config.log"; + availability = { restart = chain-restart; }; + }; + + osmosis-cvm-config = { + command = self'.packages.osmosisd-cvm-config; + depends_on."centauri-cvm-init".condition = + "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = + "process_completed_successfully"; + log_location = + "${devnet-root-directory}/osmosis-cvm-config.log"; + availability = { restart = chain-restart; }; + }; + + osmosis = { + command = self'.packages.osmosisd-gen; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/osmosis.log"; + }; + osmosis-pools-init = { + command = self'.packages.osmosisd-pools-init; + depends_on."osmosis".condition = "process_healthy"; + log_location = + "${devnet-root-directory}/osmosisd-pools-init.log"; + availability = { restart = chain-restart; }; + }; + osmosis-cvm-init = { + command = self'.packages.osmosisd-cvm-init; + depends_on."osmosis".condition = "process_healthy"; + log_location = "${devnet-root-directory}/osmosis-cvm-init.log"; + availability = { restart = chain-restart; }; + namespace = "osmosis"; + }; + + osmosis-centauri-init = { + command = self'.packages.osmosis-centauri-hermes-init; + depends_on = { + "centauri-init".condition = "process_completed_successfully"; + "osmosis".condition = "process_healthy"; + }; + namespace = "trustless-relay"; + log_location = + "${devnet-root-directory}/osmosis-centauri-init.log"; + availability = { restart = relay; }; + }; + + osmosis-centauri-relay = { + command = self'.packages.osmosis-centauri-hermes-relay; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/osmosis-centauri-relay.log"; + availability = { restart = relay; }; + namespace = "trustless-relay"; + }; + + mantis-simulate-solve = { + command = self'.packages.mantis-simulate-solve; + depends_on = { + "centauri-cvm-config".condition = + "process_completed_successfully"; + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/mantis-simulate-solve.log"; + availability = { restart = relay; }; + namespace = "xapp"; + }; + + xapp-osmosis-osmo-to-centauri = { + command = self'.packages.xapp-osmosis-osmo-to-centauri; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-osmosis-osmo-to-centauri.log"; + namespace = "xapp"; + }; + + xapp-centauri-pica-to-osmosis = { + command = self'.packages.xapp-centauri-pica-to-osmosis; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-centauri-pica-to-osmosis.log"; + namespace = "xapp"; + }; + + xapp-swap-centauri-osmo-to-osmosis-pica-and-back = { + command = + self'.packages.xapp-swap-centauri-osmo-to-osmosis-pica-and-back; + depends_on = { + "xapp-centauri-pica-to-osmosis".condition = + "process_completed_successfully"; + "xapp-osmosis-osmo-to-centauri".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-swap-centauri-osmo-to-osmosis-pica-and-back.log"; + namespace = "xapp"; + }; + + eth-gen = { + command = self'.packages.eth-gen; + log_location = "${devnet-root-directory}/eth-gen.log"; + availability = { restart = chain-restart; }; + }; + eth-consensus-gen = { + command = self'.packages.eth-consensus-gen; + log_location = "${devnet-root-directory}/eth-consensus-gen.log"; + availability = { restart = chain-restart; }; + depends_on = { + "eth-gen".condition = "process_completed_successfully"; + }; + }; + eth-executor-gen = { + command = self'.packages.eth-executor-gen; + log_location = "${devnet-root-directory}/eth-executor-gen.log"; + availability = { restart = chain-restart; }; + depends_on = { + "eth-gen".condition = "process_completed_successfully"; + + }; + }; + eth-executor = { + command = self'.packages.eth-executor; + log_location = "${devnet-root-directory}/eth-executor.log"; + availability = { restart = chain-restart; }; + depends_on = { + "eth-executor-gen".condition = + "process_completed_successfully"; + }; + readiness_probe = { + exec.command = '' + test -f ${devnet-root-directory}/eth/jwtsecret + ''; + } // parachain-startup; + + }; + eth-consensus = { + command = self'.packages.eth-consensus; + log_location = "${devnet-root-directory}/eth-consensus.log"; + availability = { restart = chain-restart; }; + depends_on = { + "eth-consensus-gen".condition = + "process_completed_successfully"; + "eth-executor".condition = "process_healthy"; + }; + }; + eth-validator = { + command = self'.packages.eth-validator; + log_location = "${devnet-root-directory}/eth-validator.log"; + availability = { restart = chain-restart; }; + depends_on = { + "eth-consensus-gen".condition = + "process_completed_successfully"; + }; + }; + }; + }; + } \ No newline at end of file diff --git a/flake/process-compose.nix b/flake/devnets/flake-module.nix similarity index 100% rename from flake/process-compose.nix rename to flake/devnets/flake-module.nix From 6cd26881d753f9f2bd3daf614f64a47a1b60be9f Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 15:26:48 +0000 Subject: [PATCH 02/23] removed noise --- .github/workflows/pull-request-comments.yml | 48 --------------------- docs/docs/nix.md | 31 ++++++++++++- 2 files changed, 29 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/pull-request-comments.yml diff --git a/.github/workflows/pull-request-comments.yml b/.github/workflows/pull-request-comments.yml deleted file mode 100644 index c22252e38d..0000000000 --- a/.github/workflows/pull-request-comments.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: pull-request-comments - -on: - pull_request: - types: [opened] -permissions: - pull-requests: write - issues: write - -jobs: - pull-request-open: - runs-on: ubuntu-latest - steps: - - name: pull-request-stats - uses: flowwer-dev/pull-request-stats@master - - name: Checkout - uses: actions/checkout@v3 - - - name: pull-request-stats-run - uses: thollander/actions-comment-pull-request@v2 - with: - reactions: "+1" - message: | - - ```shell - # run Composable node - nix run "github:ComposableFi/composable/${{ github.ref }}" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed - ```` - - ```shell - # run local Picasso DevNet (for CosmWasm development) - nix run "github:ComposableFi/composable/${{ github.ref }}#devnet-picasso" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed - ``` - - ```shell - # CosmWasm on Substrate CLI tool - nix run "github:ComposableFi/composable/${{ github.ref }}#ccw" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed - ``` - - ```shell - # run cross chain devnet with Dotsama and Cosmos nodes - nix run "github:ComposableFi/composable/${{ github.ref }}#devnet-xc-fresh" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed - # or same with docker - nix build "github:ComposableFi/composable/${{ github.ref }}#devnet-xc-image" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed \ - && docker load --input result && docker run -it --entrypoint bash devnet-xc:latest -c /bin/devnet-xc-fresh - ``` - - [About nix](https://docs.composable.finance/nix.html) \ No newline at end of file diff --git a/docs/docs/nix.md b/docs/docs/nix.md index be485f11f0..4ef7242ef4 100644 --- a/docs/docs/nix.md +++ b/docs/docs/nix.md @@ -1,6 +1,6 @@ # Nix -Nix is a requirement to set up and start a local development environment with Composable's code. We recommend using the Zero-to-Nix installer. Refer to our docs for how to [install and configure Nix](./nix/install). +Nix is a requirement to set up and start a local development environment with Composable's code. We recommend using the Zero-to-Nix installer. Refer to our docs for how to [install and configure Nix](nix/install.md). After configuration, familiarize yourself with the following commands: @@ -10,4 +10,31 @@ After configuration, familiarize yourself with the following commands: `nix run "composable#fmt"` format all files. -`nix build "composable#unit-tests"` check unit tests. \ No newline at end of file +`nix build "composable#unit-tests"` check unit tests. + + +### Per commit examples + + +```shell +# run Composable node +nix run "github:ComposableFi/composable/" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed +```` + +```shell +# run local Picasso DevNet (for CosmWasm development) +nix run "github:ComposableFi/composable/#devnet-picasso" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed +``` + +```shell +# CosmWasm on Substrate CLI tool +nix run "github:ComposableFi/composable/#ccw" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed +``` + +```shell +# run cross chain devnet with Dotsama and Cosmos nodes +nix run "github:ComposableFi/composable/#devnet-xc-fresh" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed +# or same with docker +nix build "github:ComposableFi/composable/#devnet-xc-image" --allow-import-from-derivation --extra-experimental-features "flakes nix-command" --no-sandbox --accept-flake-config --option sandbox relaxed \ +&& docker load --input result && docker run -it --entrypoint bash devnet-xc:latest -c /bin/devnet-xc-fresh +``` From c8292a466451085f889df2e716aa99ecde66a4f6 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 15:29:03 +0000 Subject: [PATCH 03/23] neutron --- flake/devnets/cosmos.nix | 538 +++++++++++++++------------------ flake/devnets/flake-module.nix | 321 +------------------- 2 files changed, 252 insertions(+), 607 deletions(-) diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index 347d89afc7..f5d0cededd 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -1,314 +1,266 @@ - devnet-cosmos = { - settings = { - log_level = "trace"; - log_location = "/tmp/composable-devnet/pc.log"; - processes = { - centauri = { - command = self'.packages.centaurid-gen; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = 26657; - }; - log_location = "${devnet-root-directory}/centauri.log"; - availability = { restart = chain-restart; }; - }; +{ pkgs +, devnet-root-directory +, self' +, chain-restart +, parachain-startup +, relay +, devnetTools +, +}: +{ + settings = { + log_level = "trace"; + log_location = "/tmp/composable-devnet/pc.log"; + processes = { + centauri = { + command = self'.packages.centaurid-gen; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = 26657; + }; + log_location = "${devnet-root-directory}/centauri.log"; + availability = { restart = chain-restart; }; + }; - neutron-init = { - command = self'.packages.neutron-gen; - log_location = "${devnet-root-directory}/neutron-init.log"; - availability = { restart = chain-restart; }; - }; + neutron-init = { + command = self'.packages.neutron-gen; + log_location = "${devnet-root-directory}/neutron-init.log"; + availability = { restart = chain-restart; }; + }; - neutron = { - command = self'.packages.neutron-start; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = networks.neutron.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/neutron-start.log"; - availability = { restart = chain-restart; }; - depends_on."neutron-init".condition = - "process_completed_successfully"; - }; + neutron = { + command = self'.packages.neutron-start; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = networks.neutron.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/neutron-start.log"; + availability = { restart = chain-restart; }; + depends_on."neutron-init".condition = + "process_completed_successfully"; + }; - cosmos-hub-init = { - command = self'.packages.cosmos-hub-gen; - log_location = "${devnet-root-directory}/cosmos-hub-init.log"; - availability = { restart = chain-restart; }; - namespace = "full-node"; - }; + cosmos-hub-init = { + command = self'.packages.cosmos-hub-gen; + log_location = "${devnet-root-directory}/cosmos-hub-init.log"; + availability = { restart = chain-restart; }; + namespace = "full-node"; + }; - cosmos-hub = { - command = self'.packages.cosmos-hub-start; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = networks.cosmos-hub.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/cosmos-hub-start.log"; - availability = { restart = chain-restart; }; - depends_on."cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "full-node"; - }; + cosmos-hub = { + command = self'.packages.cosmos-hub-start; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = networks.cosmos-hub.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/cosmos-hub-start.log"; + availability = { restart = chain-restart; }; + depends_on."cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "full-node"; + }; - neutron-cosmos-hub-init = { - command = self'.packages.neutron-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/neutron-cosmos-hub-init.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - namespace = "trustless-relay"; - }; + neutron-cosmos-hub-init = { + command = self'.packages.neutron-cosmos-hub-hermes-init; + log_location = + "${devnet-root-directory}/neutron-cosmos-hub-init.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + namespace = "trustless-relay"; + }; - cosmos-hub-neutron-relay = { - command = self'.packages.neutron-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."neutron-cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; + cosmos-hub-neutron-relay = { + command = self'.packages.neutron-cosmos-hub-hermes-relay; + log_location = + "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."neutron-cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; - centauri-neutron-init = { - command = self'.packages.neutron-centauri-hermes-init; - log_location = - "${devnet-root-directory}/centauri-neutron-init.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."osmosis-centauri-init".condition = - "process_completed_successfully"; - depends_on."neutron-cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; + centauri-neutron-init = { + command = self'.packages.neutron-centauri-hermes-init; + log_location = + "${devnet-root-directory}/centauri-neutron-init.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."osmosis-centauri-init".condition = + "process_completed_successfully"; + depends_on."neutron-cosmos-hub-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; - centauri-cosmos-hub-init = { - command = self'.packages.centauri-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/centauri-cosmos-hub-init.log"; - availability = { restart = relay; }; - depends_on."centauri".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."centauri-neutron-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; + centauri-cosmos-hub-init = { + command = self'.packages.centauri-cosmos-hub-hermes-init; + log_location = + "${devnet-root-directory}/centauri-cosmos-hub-init.log"; + availability = { restart = relay; }; + depends_on."centauri".condition = "process_healthy"; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."centauri-neutron-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; - centauri-cosmos-hub-relay = { - command = self'.packages.centauri-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; - availability = { restart = relay; }; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."cosmos-hub-centauri-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; + centauri-cosmos-hub-relay = { + command = self'.packages.centauri-cosmos-hub-hermes-relay; + log_location = + "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; + availability = { restart = relay; }; + depends_on."cosmos-hub".condition = "process_healthy"; + depends_on."cosmos-hub-centauri-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; - centauri-neutron-relay = { - command = self'.packages.centauri-neutron-hermes-relay; - log_location = - "${devnet-root-directory}/neutron-centauri-relay.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."neutron-centauri-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; + centauri-neutron-relay = { + command = self'.packages.centauri-neutron-hermes-relay; + log_location = + "${devnet-root-directory}/neutron-centauri-relay.log"; + availability = { restart = relay; }; + depends_on."neutron".condition = "process_healthy"; + depends_on."neutron-centauri-init".condition = + "process_completed_successfully"; + namespace = "trustless-relay"; + }; - centauri-init = { - command = self'.packages.centaurid-init; - depends_on."centauri".condition = "process_healthy"; - log_location = "${devnet-root-directory}/centauri-init.log"; - availability = { restart = chain-restart; }; - }; + centauri-init = { + command = self'.packages.centaurid-init; + depends_on."centauri".condition = "process_healthy"; + log_location = "${devnet-root-directory}/centauri-init.log"; + availability = { restart = chain-restart; }; + }; - centauri-cvm-init = { - command = self'.packages.centaurid-cvm-init; - depends_on."centauri".condition = "process_healthy"; - log_location = "${devnet-root-directory}/centauri-cvm-init.log"; - availability = { restart = chain-restart; }; - }; + centauri-cvm-init = { + command = self'.packages.centaurid-cvm-init; + depends_on."centauri".condition = "process_healthy"; + log_location = "${devnet-root-directory}/centauri-cvm-init.log"; + availability = { restart = chain-restart; }; + }; - centauri-cvm-config = { - command = self'.packages.centaurid-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; - log_location = - "${devnet-root-directory}/centauri-cvm-config.log"; - availability = { restart = chain-restart; }; - }; + centauri-cvm-config = { + command = self'.packages.centaurid-cvm-config; + depends_on."centauri-cvm-init".condition = + "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = + "process_completed_successfully"; + log_location = + "${devnet-root-directory}/centauri-cvm-config.log"; + availability = { restart = chain-restart; }; + }; - osmosis-cvm-config = { - command = self'.packages.osmosisd-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; - log_location = - "${devnet-root-directory}/osmosis-cvm-config.log"; - availability = { restart = chain-restart; }; - }; + osmosis-cvm-config = { + command = self'.packages.osmosisd-cvm-config; + depends_on."centauri-cvm-init".condition = + "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = + "process_completed_successfully"; + log_location = + "${devnet-root-directory}/osmosis-cvm-config.log"; + availability = { restart = chain-restart; }; + }; - osmosis = { - command = self'.packages.osmosisd-gen; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/osmosis.log"; - }; - osmosis-pools-init = { - command = self'.packages.osmosisd-pools-init; - depends_on."osmosis".condition = "process_healthy"; - log_location = - "${devnet-root-directory}/osmosisd-pools-init.log"; - availability = { restart = chain-restart; }; - }; - osmosis-cvm-init = { - command = self'.packages.osmosisd-cvm-init; - depends_on."osmosis".condition = "process_healthy"; - log_location = "${devnet-root-directory}/osmosis-cvm-init.log"; - availability = { restart = chain-restart; }; - namespace = "osmosis"; - }; + osmosis = { + command = self'.packages.osmosisd-gen; + readiness_probe.http_get = { + host = "127.0.0.1"; + port = pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT; + }; + log_location = "${devnet-root-directory}/osmosis.log"; + }; + osmosis-pools-init = { + command = self'.packages.osmosisd-pools-init; + depends_on."osmosis".condition = "process_healthy"; + log_location = + "${devnet-root-directory}/osmosisd-pools-init.log"; + availability = { restart = chain-restart; }; + }; + osmosis-cvm-init = { + command = self'.packages.osmosisd-cvm-init; + depends_on."osmosis".condition = "process_healthy"; + log_location = "${devnet-root-directory}/osmosis-cvm-init.log"; + availability = { restart = chain-restart; }; + namespace = "osmosis"; + }; - osmosis-centauri-init = { - command = self'.packages.osmosis-centauri-hermes-init; - depends_on = { - "centauri-init".condition = "process_completed_successfully"; - "osmosis".condition = "process_healthy"; - }; - namespace = "trustless-relay"; - log_location = - "${devnet-root-directory}/osmosis-centauri-init.log"; - availability = { restart = relay; }; - }; + osmosis-centauri-init = { + command = self'.packages.osmosis-centauri-hermes-init; + depends_on = { + "centauri-init".condition = "process_completed_successfully"; + "osmosis".condition = "process_healthy"; + }; + namespace = "trustless-relay"; + log_location = + "${devnet-root-directory}/osmosis-centauri-init.log"; + availability = { restart = relay; }; + }; - osmosis-centauri-relay = { - command = self'.packages.osmosis-centauri-hermes-relay; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/osmosis-centauri-relay.log"; - availability = { restart = relay; }; - namespace = "trustless-relay"; - }; + osmosis-centauri-relay = { + command = self'.packages.osmosis-centauri-hermes-relay; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/osmosis-centauri-relay.log"; + availability = { restart = relay; }; + namespace = "trustless-relay"; + }; - mantis-simulate-solve = { - command = self'.packages.mantis-simulate-solve; - depends_on = { - "centauri-cvm-config".condition = - "process_completed_successfully"; - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/mantis-simulate-solve.log"; - availability = { restart = relay; }; - namespace = "xapp"; - }; + mantis-simulate-solve = { + command = self'.packages.mantis-simulate-solve; + depends_on = { + "centauri-cvm-config".condition = + "process_completed_successfully"; + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/mantis-simulate-solve.log"; + availability = { restart = relay; }; + namespace = "xapp"; + }; - xapp-osmosis-osmo-to-centauri = { - command = self'.packages.xapp-osmosis-osmo-to-centauri; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-osmosis-osmo-to-centauri.log"; - namespace = "xapp"; - }; + xapp-osmosis-osmo-to-centauri = { + command = self'.packages.xapp-osmosis-osmo-to-centauri; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-osmosis-osmo-to-centauri.log"; + namespace = "xapp"; + }; - xapp-centauri-pica-to-osmosis = { - command = self'.packages.xapp-centauri-pica-to-osmosis; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-centauri-pica-to-osmosis.log"; - namespace = "xapp"; - }; + xapp-centauri-pica-to-osmosis = { + command = self'.packages.xapp-centauri-pica-to-osmosis; + depends_on = { + "osmosis-centauri-init".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-centauri-pica-to-osmosis.log"; + namespace = "xapp"; + }; - xapp-swap-centauri-osmo-to-osmosis-pica-and-back = { - command = - self'.packages.xapp-swap-centauri-osmo-to-osmosis-pica-and-back; - depends_on = { - "xapp-centauri-pica-to-osmosis".condition = - "process_completed_successfully"; - "xapp-osmosis-osmo-to-centauri".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-swap-centauri-osmo-to-osmosis-pica-and-back.log"; - namespace = "xapp"; - }; - - eth-gen = { - command = self'.packages.eth-gen; - log_location = "${devnet-root-directory}/eth-gen.log"; - availability = { restart = chain-restart; }; - }; - eth-consensus-gen = { - command = self'.packages.eth-consensus-gen; - log_location = "${devnet-root-directory}/eth-consensus-gen.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-gen".condition = "process_completed_successfully"; - }; - }; - eth-executor-gen = { - command = self'.packages.eth-executor-gen; - log_location = "${devnet-root-directory}/eth-executor-gen.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-gen".condition = "process_completed_successfully"; - - }; - }; - eth-executor = { - command = self'.packages.eth-executor; - log_location = "${devnet-root-directory}/eth-executor.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-executor-gen".condition = - "process_completed_successfully"; - }; - readiness_probe = { - exec.command = '' - test -f ${devnet-root-directory}/eth/jwtsecret - ''; - } // parachain-startup; - - }; - eth-consensus = { - command = self'.packages.eth-consensus; - log_location = "${devnet-root-directory}/eth-consensus.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-consensus-gen".condition = - "process_completed_successfully"; - "eth-executor".condition = "process_healthy"; - }; - }; - eth-validator = { - command = self'.packages.eth-validator; - log_location = "${devnet-root-directory}/eth-validator.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-consensus-gen".condition = - "process_completed_successfully"; - }; - }; - }; - }; - } \ No newline at end of file + xapp-swap-centauri-osmo-to-osmosis-pica-and-back = { + command = + self'.packages.xapp-swap-centauri-osmo-to-osmosis-pica-and-back; + depends_on = { + "xapp-centauri-pica-to-osmosis".condition = + "process_completed_successfully"; + "xapp-osmosis-osmo-to-centauri".condition = + "process_completed_successfully"; + }; + log_location = + "${devnet-root-directory}/xapp-swap-centauri-osmo-to-osmosis-pica-and-back.log"; + namespace = "xapp"; + }; + }; + }; +} diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index 1d073e8491..1e85c3dbca 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -13,7 +13,8 @@ failure_threshold = 16; timeout_seconds = 4; }; - in { + in + { packages = rec { @@ -471,322 +472,14 @@ parachain-startup relay devnetTools; }; - devnet-cosmos-background = devnet-cosmos // { tui = false; }; - - devnet-cosmos = { - settings = { - log_level = "trace"; - log_location = "/tmp/composable-devnet/pc.log"; - processes = { - centauri = { - command = self'.packages.centaurid-gen; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = 26657; - }; - log_location = "${devnet-root-directory}/centauri.log"; - availability = { restart = chain-restart; }; - }; - - neutron-init = { - command = self'.packages.neutron-gen; - log_location = "${devnet-root-directory}/neutron-init.log"; - availability = { restart = chain-restart; }; - }; - - neutron = { - command = self'.packages.neutron-start; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = networks.neutron.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/neutron-start.log"; - availability = { restart = chain-restart; }; - depends_on."neutron-init".condition = - "process_completed_successfully"; - }; - - cosmos-hub-init = { - command = self'.packages.cosmos-hub-gen; - log_location = "${devnet-root-directory}/cosmos-hub-init.log"; - availability = { restart = chain-restart; }; - namespace = "full-node"; - }; - - cosmos-hub = { - command = self'.packages.cosmos-hub-start; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = networks.cosmos-hub.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/cosmos-hub-start.log"; - availability = { restart = chain-restart; }; - depends_on."cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "full-node"; - }; - neutron-cosmos-hub-init = { - command = self'.packages.neutron-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/neutron-cosmos-hub-init.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - namespace = "trustless-relay"; - }; - - cosmos-hub-neutron-relay = { - command = self'.packages.neutron-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."neutron-cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; - - centauri-neutron-init = { - command = self'.packages.neutron-centauri-hermes-init; - log_location = - "${devnet-root-directory}/centauri-neutron-init.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."osmosis-centauri-init".condition = - "process_completed_successfully"; - depends_on."neutron-cosmos-hub-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; - - centauri-cosmos-hub-init = { - command = self'.packages.centauri-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/centauri-cosmos-hub-init.log"; - availability = { restart = relay; }; - depends_on."centauri".condition = "process_healthy"; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."centauri-neutron-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; - - centauri-cosmos-hub-relay = { - command = self'.packages.centauri-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; - availability = { restart = relay; }; - depends_on."cosmos-hub".condition = "process_healthy"; - depends_on."cosmos-hub-centauri-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; - - centauri-neutron-relay = { - command = self'.packages.centauri-neutron-hermes-relay; - log_location = - "${devnet-root-directory}/neutron-centauri-relay.log"; - availability = { restart = relay; }; - depends_on."neutron".condition = "process_healthy"; - depends_on."neutron-centauri-init".condition = - "process_completed_successfully"; - namespace = "trustless-relay"; - }; - - centauri-init = { - command = self'.packages.centaurid-init; - depends_on."centauri".condition = "process_healthy"; - log_location = "${devnet-root-directory}/centauri-init.log"; - availability = { restart = chain-restart; }; - }; - - centauri-cvm-init = { - command = self'.packages.centaurid-cvm-init; - depends_on."centauri".condition = "process_healthy"; - log_location = "${devnet-root-directory}/centauri-cvm-init.log"; - availability = { restart = chain-restart; }; - }; - - centauri-cvm-config = { - command = self'.packages.centaurid-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; - log_location = - "${devnet-root-directory}/centauri-cvm-config.log"; - availability = { restart = chain-restart; }; - }; - - osmosis-cvm-config = { - command = self'.packages.osmosisd-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; - log_location = - "${devnet-root-directory}/osmosis-cvm-config.log"; - availability = { restart = chain-restart; }; - }; - - osmosis = { - command = self'.packages.osmosisd-gen; - readiness_probe.http_get = { - host = "127.0.0.1"; - port = pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT; - }; - log_location = "${devnet-root-directory}/osmosis.log"; - }; - osmosis-pools-init = { - command = self'.packages.osmosisd-pools-init; - depends_on."osmosis".condition = "process_healthy"; - log_location = - "${devnet-root-directory}/osmosisd-pools-init.log"; - availability = { restart = chain-restart; }; - }; - osmosis-cvm-init = { - command = self'.packages.osmosisd-cvm-init; - depends_on."osmosis".condition = "process_healthy"; - log_location = "${devnet-root-directory}/osmosis-cvm-init.log"; - availability = { restart = chain-restart; }; - namespace = "osmosis"; - }; - - osmosis-centauri-init = { - command = self'.packages.osmosis-centauri-hermes-init; - depends_on = { - "centauri-init".condition = "process_completed_successfully"; - "osmosis".condition = "process_healthy"; - }; - namespace = "trustless-relay"; - log_location = - "${devnet-root-directory}/osmosis-centauri-init.log"; - availability = { restart = relay; }; - }; - - osmosis-centauri-relay = { - command = self'.packages.osmosis-centauri-hermes-relay; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/osmosis-centauri-relay.log"; - availability = { restart = relay; }; - namespace = "trustless-relay"; - }; - - mantis-simulate-solve = { - command = self'.packages.mantis-simulate-solve; - depends_on = { - "centauri-cvm-config".condition = - "process_completed_successfully"; - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/mantis-simulate-solve.log"; - availability = { restart = relay; }; - namespace = "xapp"; - }; - - xapp-osmosis-osmo-to-centauri = { - command = self'.packages.xapp-osmosis-osmo-to-centauri; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-osmosis-osmo-to-centauri.log"; - namespace = "xapp"; - }; - - xapp-centauri-pica-to-osmosis = { - command = self'.packages.xapp-centauri-pica-to-osmosis; - depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-centauri-pica-to-osmosis.log"; - namespace = "xapp"; - }; - - xapp-swap-centauri-osmo-to-osmosis-pica-and-back = { - command = - self'.packages.xapp-swap-centauri-osmo-to-osmosis-pica-and-back; - depends_on = { - "xapp-centauri-pica-to-osmosis".condition = - "process_completed_successfully"; - "xapp-osmosis-osmo-to-centauri".condition = - "process_completed_successfully"; - }; - log_location = - "${devnet-root-directory}/xapp-swap-centauri-osmo-to-osmosis-pica-and-back.log"; - namespace = "xapp"; - }; - - eth-gen = { - command = self'.packages.eth-gen; - log_location = "${devnet-root-directory}/eth-gen.log"; - availability = { restart = chain-restart; }; - }; - eth-consensus-gen = { - command = self'.packages.eth-consensus-gen; - log_location = "${devnet-root-directory}/eth-consensus-gen.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-gen".condition = "process_completed_successfully"; - }; - }; - eth-executor-gen = { - command = self'.packages.eth-executor-gen; - log_location = "${devnet-root-directory}/eth-executor-gen.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-gen".condition = "process_completed_successfully"; + devnet-cosmos = import ./devnets/picasso-centauri.nix { + inherit pkgs devnet-root-directory self' chain-restart + parachain-startup relay devnetTools; + }; - }; - }; - eth-executor = { - command = self'.packages.eth-executor; - log_location = "${devnet-root-directory}/eth-executor.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-executor-gen".condition = - "process_completed_successfully"; - }; - readiness_probe = { - exec.command = '' - test -f ${devnet-root-directory}/eth/jwtsecret - ''; - } // parachain-startup; + devnet-cosmos-background = devnet-cosmos // { tui = false; }; - }; - eth-consensus = { - command = self'.packages.eth-consensus; - log_location = "${devnet-root-directory}/eth-consensus.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-consensus-gen".condition = - "process_completed_successfully"; - "eth-executor".condition = "process_healthy"; - }; - }; - eth-validator = { - command = self'.packages.eth-validator; - log_location = "${devnet-root-directory}/eth-validator.log"; - availability = { restart = chain-restart; }; - depends_on = { - "eth-consensus-gen".condition = - "process_completed_successfully"; - }; - }; - }; - }; - }; }; }; From 2e26a53618dbce300549172e6d1ed9fb8ece97d8 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 15:45:49 +0000 Subject: [PATCH 04/23] making config shared --- flake/cvm.json | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 flake/cvm.json diff --git a/flake/cvm.json b/flake/cvm.json new file mode 100644 index 0000000000..3eb4bdd762 --- /dev/null +++ b/flake/cvm.json @@ -0,0 +1,201 @@ +{ + "config": { + "force": [ + { + "force_network": { + "network_id": 3, + "accounts": { + "bech": "osmo" + }, + "gateway": { + "cosm_wasm": { + "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true + } + } + } + } + } + } + }, + { + "force_network": { + "network_id": 2, + "accounts": { + "bech": "centauri" + }, + "gateway": { + "cosm_wasm": { + "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true + } + } + } + } + } + } + }, + { + "force_network_to_network": { + "from": 2, + "to": 3, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" + } + } + } + }, + { + "force_network_to_network": { + "from": 3, + "to": 2, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" + } + } + } + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851009", + "network_id": 3, + "local": { + "native": { + "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "ppica", + "trace_path": "transfer/channel-0" + } + } + } + } + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900673", + "network_id": 2, + "local": { + "native": { + "denom": "ppica" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "1", + "trace_path": "transfer/channel-1" + } + } + } + } + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900674", + "network_id": 2, + "local": { + "native": { + "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "uosmo", + "trace_path": "transfer/channel-0" + } + } + } + } + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851010", + "network_id": 3, + "local": { + "native": { + "denom": "uosmo" + } + } + } + }, + { + "force_exchange": { + "exchange": { + "osmosis_cross_chain_swap": { + "pool_id": 1, + "token_a": "uosmo", + "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "exchange_id": "237684489387467420151587012609", + "network_id": 3 + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900673", + "other_network": 3, + "other_asset": "237684487542793012780631851009" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851009", + "other_network": 2, + "other_asset": "158456325028528675187087900673" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900674", + "other_network": 3, + "other_asset": "237684487542793012780631851010" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851010", + "other_network": 2, + "other_asset": "158456325028528675187087900674" + } + } + ] + } +} \ No newline at end of file From f42bf238a67f967e73bea5da457e6c712ce9b85b Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 15:59:24 +0000 Subject: [PATCH 05/23] config --- flake/cosmos/osmosis.nix | 203 +---------------------- flake/cvm.json | 348 ++++++++++++++++++++------------------- 2 files changed, 176 insertions(+), 375 deletions(-) diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index fe72af664b..45a822f2c9 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -249,208 +249,7 @@ OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") FORCE_CONFIG=$(cat << EOF - { - "config": { - "force": [ - { - "force_network": { - "network_id": 3, - "accounts": { - "bech": "osmo" - }, - "gateway": { - "cosm_wasm": { - "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } - } - } - } - } - } - }, - { - "force_network": { - "network_id": 2, - "accounts": { - "bech": "centauri" - }, - "gateway": { - "cosm_wasm": { - "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } - } - } - } - } - } - }, - { - "force_network_to_network": { - "from": 2, - "to": 3, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } - } - } - }, - { - "force_network_to_network": { - "from": 3, - "to": 2, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } - } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851009", - "network_id": 3, - "local": { - "native": { - "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "ppica", - "trace_path": "transfer/channel-0" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900673", - "network_id": 2, - "local": { - "native": { - "denom": "ppica" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "1", - "trace_path": "transfer/channel-1" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900674", - "network_id": 2, - "local": { - "native": { - "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "uosmo", - "trace_path": "transfer/channel-0" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851010", - "network_id": 3, - "local": { - "native": { - "denom": "uosmo" - } - } - } - }, - { - "force_exchange": { - "exchange": { - "osmosis_cross_chain_swap": - { - "pool_id": 1, - "token_a": "uosmo", - "token_b": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" - } - }, - "exchange_id": "237684489387467420151587012609", - "network_id": 3 - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900673", - "other_network": 3, - "other_asset": "237684487542793012780631851009" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851009", - "other_network": 2, - "other_asset": "158456325028528675187087900673" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900674", - "other_network": 3, - "other_asset": "237684487542793012780631851010" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851010", - "other_network": 2, - "other_asset": "158456325028528675187087900674" - } - } - ] - } - } + EOF ) "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace diff --git a/flake/cvm.json b/flake/cvm.json index 3eb4bdd762..3c3995f1ea 100644 --- a/flake/cvm.json +++ b/flake/cvm.json @@ -1,201 +1,203 @@ { - "config": { - "force": [ - { - "force_network": { - "network_id": 3, - "accounts": { - "bech": "osmo" - }, - "gateway": { - "cosm_wasm": { - "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true + "config": { + "force": [ + { + "force_network": { + "network_id": 3, + "accounts": { + "bech": "osmo" + }, + "gateway": { + "cosm_wasm": { + "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true + } } } } } } - } - }, - { - "force_network": { - "network_id": 2, - "accounts": { - "bech": "centauri" - }, - "gateway": { - "cosm_wasm": { - "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true + }, + { + "force_network": { + "network_id": 2, + "accounts": { + "bech": "centauri" + }, + "gateway": { + "cosm_wasm": { + "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true + } } } } } } - } - }, - { - "force_network_to_network": { - "from": 2, - "to": 3, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" + }, + { + "force_network_to_network": { + "from": 2, + "to": 3, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" + } } } - } - }, - { - "force_network_to_network": { - "from": 3, - "to": 2, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" + }, + { + "force_network_to_network": { + "from": 3, + "to": 2, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" + } } } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851009", - "network_id": 3, - "local": { - "native": { - "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "ppica", - "trace_path": "transfer/channel-0" + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851009", + "network_id": 3, + "local": { + "native": { + "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "ppica", + "trace_path": "transfer/channel-0" + } } } } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900673", - "network_id": 2, - "local": { - "native": { - "denom": "ppica" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "1", - "trace_path": "transfer/channel-1" + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900673", + "network_id": 2, + "local": { + "native": { + "denom": "ppica" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "1", + "trace_path": "transfer/channel-1" + } } } } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900674", - "network_id": 2, - "local": { - "native": { - "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "uosmo", - "trace_path": "transfer/channel-0" + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900674", + "network_id": 2, + "local": { + "native": { + "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "uosmo", + "trace_path": "transfer/channel-0" + } } } } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851010", - "network_id": 3, - "local": { - "native": { - "denom": "uosmo" + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851010", + "network_id": 3, + "local": { + "native": { + "denom": "uosmo" + } } } + }, + { + "force_exchange": { + "exchange": { + "osmosis_cross_chain_swap" : + { + "pool_id": 1, + "token_a": "uosmo", + "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "exchange_id": "237684489387467420151587012609", + "network_id": 3 + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900673", + "other_network": 3, + "other_asset": "237684487542793012780631851009" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851009", + "other_network": 2, + "other_asset": "158456325028528675187087900673" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900674", + "other_network": 3, + "other_asset": "237684487542793012780631851010" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851010", + "other_network": 2, + "other_asset": "158456325028528675187087900674" + } } - }, - { - "force_exchange": { - "exchange": { - "osmosis_cross_chain_swap": { - "pool_id": 1, - "token_a": "uosmo", - "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "exchange_id": "237684489387467420151587012609", - "network_id": 3 - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900673", - "other_network": 3, - "other_asset": "237684487542793012780631851009" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851009", - "other_network": 2, - "other_asset": "158456325028528675187087900673" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900674", - "other_network": 3, - "other_asset": "237684487542793012780631851010" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851010", - "other_network": 2, - "other_asset": "158456325028528675187087900674" - } - } - ] + ] + } } -} \ No newline at end of file + \ No newline at end of file From e1cd39684f16d13de6572a421b6230c73c68b3bf Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 16:02:02 +0000 Subject: [PATCH 06/23] fixed flake --- flake.nix | 2 +- flake/devnets/flake-module.nix | 4 +- .../composable-cosmos/flake-module.nix | 203 +----------------- 3 files changed, 4 insertions(+), 205 deletions(-) diff --git a/flake.nix b/flake.nix index 5369dacf1d..5f5ef9fb54 100644 --- a/flake.nix +++ b/flake.nix @@ -162,7 +162,7 @@ ./flake/xapps.nix ./flake/xapps.nix ./flake/overlays.nix - ./flake/process-compose.nix + ./flake/devnets/flake-module.nix ./flake/release.nix ./flake/mantis.nix ./flake/rust.nix diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index 1e85c3dbca..e27e18fdfe 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -467,13 +467,13 @@ }; }; - devnet-picasso-centauri = import ./devnets/picasso-centauri.nix { + devnet-picasso-centauri = import ./picasso-centauri.nix { inherit pkgs devnet-root-directory self' chain-restart parachain-startup relay devnetTools; }; - devnet-cosmos = import ./devnets/picasso-centauri.nix { + devnet-cosmos = import ./cosmos.nix { inherit pkgs devnet-root-directory self' chain-restart parachain-startup relay devnetTools; }; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index a191be4ddc..ec466a35c8 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -204,208 +204,7 @@ OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") FORCE_CONFIG=$(cat << EOF - { - "config": { - "force": [ - { - "force_network": { - "network_id": 3, - "accounts": { - "bech": "osmo" - }, - "gateway": { - "cosm_wasm": { - "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } - } - } - } - } - } - }, - { - "force_network": { - "network_id": 2, - "accounts": { - "bech": "centauri" - }, - "gateway": { - "cosm_wasm": { - "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } - } - } - } - } - } - }, - { - "force_network_to_network": { - "from": 2, - "to": 3, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } - } - } - }, - { - "force_network_to_network": { - "from": 3, - "to": 2, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } - } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851009", - "network_id": 3, - "local": { - "native": { - "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "ppica", - "trace_path": "transfer/channel-0" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900673", - "network_id": 2, - "local": { - "native": { - "denom": "ppica" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "1", - "trace_path": "transfer/channel-1" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900674", - "network_id": 2, - "local": { - "native": { - "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "uosmo", - "trace_path": "transfer/channel-0" - } - } - } - } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851010", - "network_id": 3, - "local": { - "native": { - "denom": "uosmo" - } - } - } - }, - { - "force_exchange": { - "exchange": { - "osmosis_cross_chain_swap" : - { - "pool_id": 1, - "token_a": "uosmo", - "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "exchange_id": "237684489387467420151587012609", - "network_id": 3 - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900673", - "other_network": 3, - "other_asset": "237684487542793012780631851009" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851009", - "other_network": 2, - "other_asset": "158456325028528675187087900673" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900674", - "other_network": 3, - "other_asset": "237684487542793012780631851010" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851010", - "other_network": 2, - "other_asset": "158456325028528675187087900674" - } - } - ] - } - } + EOF ) From e704c48c9980b91d5d42c6226a2b25f24115713c Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 16:36:03 +0000 Subject: [PATCH 07/23] happy --- docs/docs/develop/composable-cosmos.md | 10 +-- flake/cosmos/neutron.nix | 70 ++++++++++++++++ flake/cosmos/osmosis.nix | 20 ++--- flake/devnets/cosmos.nix | 1 + flake/devnets/flake-module.nix | 2 +- .../composable-cosmos/flake-module.nix | 80 +++++++++---------- 6 files changed, 127 insertions(+), 56 deletions(-) diff --git a/docs/docs/develop/composable-cosmos.md b/docs/docs/develop/composable-cosmos.md index 9d8a0b9485..5df4d072cf 100644 --- a/docs/docs/develop/composable-cosmos.md +++ b/docs/docs/develop/composable-cosmos.md @@ -1,10 +1,10 @@ # Composable Cosmos Mainnet ## Information -- Network information: https://github.com/notional-labs/composable-centauri +- Network information: https://github.com/ComposableFi/composable-cosmos - Chain ID: centauri-1 - Genesis: https://github.com/notional-labs/composable-networks/blob/main/mainnet/genesis.json -- Binary: https://github.com/notional-labs/composable-centauri/releases/tag/v6.3.1 +- Binary: https://github.com/ComposableFi/composable-cosmos/releases/tag/v6.3.1 - Current version: v6.3.1 (check the repository for the latest release) - Public Notional endpoints: - RPC: https://composable-rpc.polkachu.com/ (1) https://api-composable-ia.cosmosia.notional.ventures (2) @@ -20,16 +20,16 @@ Quad core or larger amd64 CPU ``` ## Binary -Mainnet launch version: v2.3.5, precompiled binary for linux-amd64 could be found here: https://github.com/notional-labs/composable-centauri/releases/tag/v2.3.5 +Mainnet launch version: v2.3.5, precompiled binary for linux-amd64 could be found here: https://github.com/ComposableFi/composable-cosmos/releases/tag/v2.3.5 ``` -git clone https://github.com/notional-labs/composable-centauri +git clone https://github.com/ComposableFi/composable-cosmos cd composable-centauri git checkout v5.2.2 make install ``` :::note -Ensure you are running the latest release, head to the [repository](https://github.com/notional-labs/composable-centauri) for the Composable Cosmos chain for assurance. +Ensure you are running the latest release, head to the [repository](https://github.com/ComposableFi/composable-cosmos) for the Composable Cosmos chain for assurance. ::: ## Genesis diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 56a85a2596..d40cd22558 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -26,6 +26,76 @@ ''; }; + neutron-cvm-init = pkgs.writeShellApplication { + name = "neutron-cvm-init"; + runtimeInputs = devnetTools.withBaseContainerTools ++ [ + neutrond + pkgs.jq + self.inputs.cvm.packages."${system}".cw-cvm-executor + self.inputs.cvm.packages."${system}".cw-cvm-gateway + ]; + + text = '' + CHAIN_DATA="${devnet-root-directory}/.neutrond" + ${bashTools.export pkgs.networksLib.neutron.devnet} + KEYRING_TEST="$CHAIN_DATA/keyring-test" + KEY=${cosmosTools.cvm.centauri} + + function init_cvm() { + local INSTANTIATE=$1 + "$BINARY" tx wasm store "${ + self.inputs.cvm.packages."${system}".cw-cvm-gateway + }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + GATEWAY_CODE_ID=1 + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store "${ + self.inputs.cvm.packages."${system}".cw-cvm-executor + }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store "${ + self.inputs.cvm.packages."${system}".cw-mantis-order + }/lib/cw_mantis_order.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + ORDER_CODE_ID=4 + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store "${ + self.inputs.instrumental.packages."${system}".staking + }/lib/staking.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + # INSTRUMENTAL_STAKING_CODE_ID=5 + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm instantiate2 $ORDER_CODE_ID "{}" "1234" --label "mantis-order" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + + sleep $BLOCK_SECONDS + GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" + + ORDER_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$ORDER_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + echo "$ORDER_CONTRACT_ADDRESS" > "$CHAIN_DATA/ORDER_CONTRACT_ADDRESS" + + echo "2" > "$CHAIN_DATA/interpreter_code_id" + } + + INSTANTIATE=$(cat << EOF + { + "admin" : "$KEY", + "network_id" : $NETWORK_ID + } + EOF + ) + + init_cvm "$INSTANTIATE" + ''; + }; + neutron-gen = pkgs.writeShellApplication { name = "neutron-gen"; runtimeInputs = devnetTools.withBaseContainerTools diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index 45a822f2c9..32ffa5d7ed 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -152,9 +152,9 @@ dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$P2PPORT" '.p2p.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$CONSENSUS_RPC_PORT" '.rpc.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://127.0.0.1:36658" '.proxy_app' - dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://localhost:$PORT" '.node' + dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://localhost:$RPCPORT" '.node' - dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$PORT" '.node' + dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$RPCPORT" '.node' osmosisd start --home "$CHAIN_DATA" --rpc.unsafe --pruning=nothing --p2p.pex false --p2p.upnp false --p2p.seed_mode true --log_level trace --trace @@ -187,24 +187,24 @@ echo $NETWORK_ID "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" GATEWAY_CODE_ID=1 sleep "$BLOCK_SECONDS" "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-executor - }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" INTERPRETER_CODE_ID=2 sleep "$BLOCK_SECONDS" - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep "$BLOCK_SECONDS" - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" sleep "$BLOCK_SECONDS" - GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$GATEWAY_CONTRACT_ADDRESS" | tee "$CHAIN_DATA/gateway_contract_address" echo "$INTERPRETER_CODE_ID" > "$CHAIN_DATA/interpreter_code_id" } @@ -249,14 +249,14 @@ OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") FORCE_CONFIG=$(cat << EOF - + ${builtins.readFile ../cvm.json} EOF ) - "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace sleep "$BLOCK_SECONDS" - "$BINARY" query wasm contract-state all "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" + "$BINARY" query wasm contract-state all "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --home "$CHAIN_DATA" ''; }; }; diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index f5d0cededd..04054fa7c0 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -5,6 +5,7 @@ , parachain-startup , relay , devnetTools +, networks , }: { diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index e27e18fdfe..1d9b6b3def 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -475,7 +475,7 @@ devnet-cosmos = import ./cosmos.nix { inherit pkgs devnet-root-directory self' chain-restart - parachain-startup relay devnetTools; + parachain-startup relay devnetTools networks; }; devnet-cosmos-background = devnet-cosmos // { tui = false; }; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index ec466a35c8..9bbdb2ae2d 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -99,7 +99,46 @@ ''; }; - centaurid-cvm-init = pkgs.writeShellApplication { + centaurid-cvm-config = pkgs.writeShellApplication { + name = "centaurid-cvm-config"; + runtimeInputs = devnetTools.withBaseContainerTools ++ [ + centaurid + pkgs.jq + self.inputs.cvm.packages."${system}".cw-cvm-executor + self.inputs.cvm.packages."${system}".cw-cvm-gateway + ]; + + text = '' + + HOME=${devnet-root-directory} + export HOME + KEY=${cosmosTools.cvm.centauri} + + CHAIN_DATA="$HOME/.centaurid" + ${bashTools.export pkgs.networksLib.pica.devnet} + KEYRING_TEST="$CHAIN_DATA/keyring-test" + PORT=26657 + BLOCK_SECONDS=5 + FEE=ppica + BINARY=centaurid + + CENTAURI_GATEWAY_CONTRACT_ADDRESS=$(cat $HOME/.centaurid/gateway_contract_address) + CENTAURI_INTERPRETER_CODE_ID=$(cat $HOME/.centaurid/interpreter_code_id) + OSMOSIS_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.osmosisd/gateway_contract_address") + OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") + + FORCE_CONFIG=$(cat << EOF + ${builtins.readFile ../../../flake/cvm.json} + EOF + ) + + "$BINARY" tx wasm execute "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" --trace --log_level trace + sleep $BLOCK_SECONDS + "$BINARY" query wasm contract-state all "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" + ''; + }; + + centaurid-cvm-init = pkgs.writeShellApplication { name = "centaurid-cvm-init"; runtimeInputs = devnetTools.withBaseContainerTools ++ [ centaurid @@ -175,45 +214,6 @@ ''; }; - centaurid-cvm-config = pkgs.writeShellApplication { - name = "centaurid-cvm-config"; - runtimeInputs = devnetTools.withBaseContainerTools ++ [ - centaurid - pkgs.jq - self.inputs.cvm.packages."${system}".cw-cvm-executor - self.inputs.cvm.packages."${system}".cw-cvm-gateway - ]; - - text = '' - - HOME=${devnet-root-directory} - export HOME - KEY=${cosmosTools.cvm.centauri} - - CHAIN_DATA="$HOME/.centaurid" - ${bashTools.export pkgs.networksLib.pica.devnet} - KEYRING_TEST="$CHAIN_DATA/keyring-test" - PORT=26657 - BLOCK_SECONDS=5 - FEE=ppica - BINARY=centaurid - - CENTAURI_GATEWAY_CONTRACT_ADDRESS=$(cat $HOME/.centaurid/gateway_contract_address) - CENTAURI_INTERPRETER_CODE_ID=$(cat $HOME/.centaurid/interpreter_code_id) - OSMOSIS_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.osmosisd/gateway_contract_address") - OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") - - FORCE_CONFIG=$(cat << EOF - - EOF - ) - - "$BINARY" tx wasm execute "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" --trace --log_level trace - sleep $BLOCK_SECONDS - "$BINARY" query wasm contract-state all "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" - ''; - }; - mantis-order-solve = pkgs.writeShellApplication { name = "mantis-order-solve"; runtimeInputs = devnetTools.withBaseContainerTools From e14b2c7d2800d2ffd3893f3b67e8c71f1fbd38bc Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 16:50:32 +0000 Subject: [PATCH 08/23] fixing ports osmosis --- flake/cosmos/osmosis.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index 32ffa5d7ed..fe942679ef 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -152,9 +152,8 @@ dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$P2PPORT" '.p2p.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$CONSENSUS_RPC_PORT" '.rpc.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://127.0.0.1:36658" '.proxy_app' - dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://localhost:$RPCPORT" '.node' - dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$RPCPORT" '.node' + dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$PORT" '.node' osmosisd start --home "$CHAIN_DATA" --rpc.unsafe --pruning=nothing --p2p.pex false --p2p.upnp false --p2p.seed_mode true --log_level trace --trace @@ -187,24 +186,24 @@ echo $NETWORK_ID "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" GATEWAY_CODE_ID=1 sleep "$BLOCK_SECONDS" "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-executor - }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" INTERPRETER_CODE_ID=2 sleep "$BLOCK_SECONDS" - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep "$BLOCK_SECONDS" - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" sleep "$BLOCK_SECONDS" - GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$GATEWAY_CONTRACT_ADDRESS" | tee "$CHAIN_DATA/gateway_contract_address" echo "$INTERPRETER_CODE_ID" > "$CHAIN_DATA/interpreter_code_id" } @@ -252,11 +251,11 @@ ${builtins.readFile ../cvm.json} EOF ) - "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace sleep "$BLOCK_SECONDS" - "$BINARY" query wasm contract-state all "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$RPCPORT" --output json --home "$CHAIN_DATA" + "$BINARY" query wasm contract-state all "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" ''; }; }; From c07aac02b985356630ac1b48f259caeeedfbec22 Mon Sep 17 00:00:00 2001 From: dz Date: Thu, 7 Dec 2023 17:34:05 +0000 Subject: [PATCH 09/23] need to init --- flake.lock | 513 +++++++++++++++++---------------------- flake/cosmos/neutron.nix | 33 +-- flake/cosmos/osmosis.nix | 4 +- flake/dev-shells.nix | 29 +++ flake/mantis.nix | 2 +- 5 files changed, 265 insertions(+), 316 deletions(-) diff --git a/flake.lock b/flake.lock index b9ff1d8d26..5de4e68e5a 100644 --- a/flake.lock +++ b/flake.lock @@ -166,16 +166,16 @@ "celestia-src_2": { "flake": false, "locked": { - "lastModified": 1697229641, - "narHash": "sha256-1HvYCZEcB7BCY5q9ykEZuCMzqcbA3JoDMwoHVJ0+SaY=", + "lastModified": 1700494564, + "narHash": "sha256-O6KrCStrZLmWy3xybQUNsWEb3O7vIRCFDE9MsEtsFro=", "owner": "celestiaorg", "repo": "celestia-app", - "rev": "2b8cc9e23826ccb658b7dd5aa6cd51a0921a0c29", + "rev": "2dbfabf1849e166974c1287c35b43e5e07727643", "type": "github" }, "original": { "owner": "celestiaorg", - "ref": "v1.1.0", + "ref": "v1.4.0", "repo": "celestia-app", "type": "github" } @@ -200,17 +200,17 @@ "centauri-src_2": { "flake": false, "locked": { - "lastModified": 1699873949, - "narHash": "sha256-oJNkzBM0pD6+KkIH8ICVcl8yp94R2EoIsvb/i+t5c8c=", - "owner": "dzmitry-lahoda-forks", - "repo": "composable-centauri", - "rev": "c6736b946c3bc6c7c23788d499b2dff94ffd39f5", + "lastModified": 1701431373, + "narHash": "sha256-EpZ1CQN0gMU8W1u3CMbqlaHeeVpQO2i1GPg6pOyOQTc=", + "owner": "ComposableFi", + "repo": "composable-cosmos", + "rev": "387c96b434db9d96b0506aa7f14536d9bdec968c", "type": "github" }, "original": { - "owner": "dzmitry-lahoda-forks", - "repo": "composable-centauri", - "rev": "c6736b946c3bc6c7c23788d499b2dff94ffd39f5", + "owner": "ComposableFi", + "repo": "composable-cosmos", + "rev": "387c96b434db9d96b0506aa7f14536d9bdec968c", "type": "github" } }, @@ -437,8 +437,9 @@ "cosmos-sdk-src": "cosmos-sdk-src_2", "cosmwasm-src": "cosmwasm-src_2", "crescent-src": "crescent-src_2", + "cw-plus-src": "cw-plus-src_2", "evmos-src": "evmos-src_2", - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts_3", "gaia-main-src": "gaia-main-src_2", "gaia10-src": "gaia10-src_2", "gaia11-src": "gaia11-src_2", @@ -476,7 +477,7 @@ "nixpkgs" ], "osmosis-src": "osmosis-src_2", - "pre-commit-hooks": "pre-commit-hooks", + "provenance-src": "provenance-src_2", "regen-src": "regen-src_2", "relayer-src": "relayer-src_2", "rust-overlay": [ @@ -491,24 +492,24 @@ "stoml-src": "stoml-src_2", "stride-consumer-src": "stride-consumer-src_2", "stride-src": "stride-src_2", - "ts-relayer-src": "ts-relayer-src", "umee-src": "umee-src_2", "wasmd-src": "wasmd-src_2", "wasmd_next-src": "wasmd_next-src_2", - "wasmvm_0_16_3-src": "wasmvm_0_16_3-src", "wasmvm_1-src": "wasmvm_1-src_2", "wasmvm_1_1_1-src": "wasmvm_1_1_1-src_2", "wasmvm_1_1_2-src": "wasmvm_1_1_2-src_2", "wasmvm_1_2_3-src": "wasmvm_1_2_3-src_2", "wasmvm_1_2_4-src": "wasmvm_1_2_4-src_2", + "wasmvm_1_3_0-src": "wasmvm_1_3_0-src_2", + "wasmvm_1_5_0-src": "wasmvm_1_5_0-src_2", "wasmvm_1_beta7-src": "wasmvm_1_beta7-src_2" }, "locked": { - "lastModified": 1700133562, - "narHash": "sha256-ItMoSAOJq2yKXeeyqXB+Aei+qlmwmmPz9HgnGAfDJNs=", + "lastModified": 1701457684, + "narHash": "sha256-Tx3WsOM9scTXDHFyL5vNcQnCmT7Mx0dYg1Nmz8cFwt4=", "owner": "informalsystems", "repo": "cosmos.nix", - "rev": "f93ee05ad75196fa48ec025b1632cd12ba322e5c", + "rev": "c0bb979a518aa08ba064112a85e03fbc7a7d2869", "type": "github" }, "original": { @@ -537,16 +538,16 @@ "cosmwasm-src_2": { "flake": false, "locked": { - "lastModified": 1685975182, - "narHash": "sha256-6uhJijuDPXvEZG8mKBGyswsj/JR75Ui713BVx4XD7WI=", + "lastModified": 1698745412, + "narHash": "sha256-41s5jLFzw9Jo+dirAVOad1dtUqCBY6rIz/6TRc0frMw=", "owner": "CosmWasm", "repo": "cosmwasm", - "rev": "b8e9c03e744e8b84174477e20eb934529cad41e7", + "rev": "89891f0bb2de2c83d00600208695d0d5e1b617ac", "type": "github" }, "original": { "owner": "CosmWasm", - "ref": "v1.2.6", + "ref": "v1.5.0", "repo": "cosmwasm", "type": "github" } @@ -579,11 +580,11 @@ ] }, "locked": { - "lastModified": 1699548976, - "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", + "lastModified": 1701622587, + "narHash": "sha256-o3XhxCCyrUHZ0tlta2W7/MuXzy+n0+BUt3rKFK3DIK4=", "owner": "ipetkov", "repo": "crane", - "rev": "6849911446e18e520970cc6b7a691e64ee90d649", + "rev": "c09d2cbe84cc2adfe1943cb2a0b55a71c835ca9a", "type": "github" }, "original": { @@ -594,7 +595,7 @@ }, "crane_3": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": [ "helix", "flake-utils" @@ -661,16 +662,16 @@ "cosmos": "cosmos_2", "crane": "crane_2", "devour-flake": "devour-flake", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1701252183, - "narHash": "sha256-MAn4pae0/ptfkhzoF2xQGvqaOtLDIVgh0vI7kTfxyEM=", + "lastModified": 1701961899, + "narHash": "sha256-+HbvhDh/3n1I578lrXsb1jwO6RT5g6iDLThmZFpx9Z0=", "owner": "ComposableFi", "repo": "cvm", - "rev": "2cd39a8287ee280022b06639eeb1f7eb9e2430f5", + "rev": "02e08fb4992968eb33b253ffa565dcc23095b1a6", "type": "github" }, "original": { @@ -696,6 +697,23 @@ "type": "github" } }, + "cw-plus-src_2": { + "flake": false, + "locked": { + "lastModified": 1700757493, + "narHash": "sha256-E5vkY+B4BDoTDtvuB+7Tm3k/5dCYPSjUujMWcgYsWf0=", + "owner": "CosmWasm", + "repo": "cw-plus", + "rev": "d33824679d5b91ca0b4615a8dede7e0028947486", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v1.1.2", + "repo": "cw-plus", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -719,10 +737,10 @@ }, "devenv": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nix": "nix", "nixpkgs": "nixpkgs_5", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { "lastModified": 1699541523, @@ -776,7 +794,7 @@ "ethereum", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1698410321, @@ -813,8 +831,8 @@ "inputs": { "devour-flake": "devour-flake_2", "devshell": "devshell", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_5", "flake-root": "flake-root", "foundry-nix": "foundry-nix", "hercules-ci-effects": "hercules-ci-effects", @@ -909,22 +927,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -939,7 +941,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -1002,12 +1004,30 @@ "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", "type": "github" }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, "original": { "id": "flake-parts", "type": "indirect" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "ethereum", @@ -1028,7 +1048,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "ethereum", @@ -1049,9 +1069,9 @@ "type": "indirect" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" + "nixpkgs-lib": "nixpkgs-lib_5" }, "locked": { "lastModified": 1688466019, @@ -1067,9 +1087,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1678379998, @@ -1116,23 +1136,8 @@ } }, "flake-utils_10": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -1149,15 +1154,12 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -1168,25 +1170,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -1202,9 +1186,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_2" }, "locked": { "lastModified": 1685518550, @@ -1220,7 +1204,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -1235,9 +1219,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_4" }, "locked": { "lastModified": 1689068808, @@ -1253,9 +1237,9 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "inputs": { - "systems": "systems_7" + "systems": "systems_5" }, "locked": { "lastModified": 1689068808, @@ -1271,9 +1255,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_8" + "systems": "systems_6" }, "locked": { "lastModified": 1694529238, @@ -1289,9 +1273,24 @@ "type": "github" } }, + "flake-utils_9": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "foundry-nix": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": [ "ethereum", "nixpkgs" @@ -1738,17 +1737,17 @@ "gex-src_2": { "flake": false, "locked": { - "lastModified": 1660333522, - "narHash": "sha256-7jtCpOTHamXAInfKYkMIDFKF4lViuPkusThj4ggGUbg=", + "lastModified": 1697704475, + "narHash": "sha256-lgJVxn7Q2I8TBdvbzyn7bl1MN5StEw3NvRzCvBFFuB8=", "owner": "cosmos", "repo": "gex", - "rev": "bc168741b2019745d343606d31b5c274f216fc3f", + "rev": "233d335dc9e8c89fb318d1081fae74435f6cac11", "type": "github" }, "original": { "owner": "cosmos", "repo": "gex", - "rev": "bc168741b2019745d343606d31b5c274f216fc3f", + "rev": "233d335dc9e8c89fb318d1081fae74435f6cac11", "type": "github" } }, @@ -1774,29 +1773,6 @@ } }, "gitignore_2": { - "inputs": { - "nixpkgs": [ - "cvm", - "cosmos", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { "inputs": { "nixpkgs": [ "devenv", @@ -1821,7 +1797,7 @@ "helix": { "inputs": { "crane": "crane_3", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_2" }, @@ -1841,7 +1817,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -2442,16 +2418,16 @@ "juno-src_2": { "flake": false, "locked": { - "lastModified": 1679292088, - "narHash": "sha256-9xWOnlqjJWY7dyICYjl1Fmqi27352TF9ihcbZBI/Dps=", + "lastModified": 1697166503, + "narHash": "sha256-z9TOeDyUnn1T8Z662XqQJ9ydVIKKB54YISt7ms4xvos=", "owner": "CosmosContracts", "repo": "juno", - "rev": "1f392744afd9829f3f7837fe6f13800a19bad961", + "rev": "48507ed9b83511089cbf1fdc5bae54cae4a7f4b2", "type": "github" }, "original": { "owner": "CosmosContracts", - "ref": "v13.0.1", + "ref": "v17.1.1", "repo": "juno", "type": "github" } @@ -2492,16 +2468,16 @@ "migaloo-src_2": { "flake": false, "locked": { - "lastModified": 1681833529, - "narHash": "sha256-7sOAcUcc1HpZgLjjdiNuXeXCq9vB9EXCMY4YIT1MAgU=", + "lastModified": 1699273936, + "narHash": "sha256-O+vGWFnV3+bvXinxl1QjVyDnQskp5H1VnlL+TaMfiSs=", "owner": "White-Whale-Defi-Platform", "repo": "migaloo-chain", - "rev": "129e6fecd377614123f2af33417f9e31accf195f", + "rev": "de98de2dd96917ae1ab79161d573fc0b4ee1facf", "type": "github" }, "original": { "owner": "White-Whale-Defi-Platform", - "ref": "v2.0.2", + "ref": "v3.0.2", "repo": "migaloo-chain", "type": "github" } @@ -2511,11 +2487,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1701713114, - "narHash": "sha256-7GvC30xieNZh2Pj2FUFaGF8ttTGvgEdtQ5zwLCJHrlg=", + "lastModified": 1701970087, + "narHash": "sha256-2zdqvtphiCPXCLQ0fCNFqEJKSfSZABpfos0CxAt1KKY=", "owner": "ComposableFi", "repo": "networks", - "rev": "141f1a06b2086c6ffab2bafcf780585f231690c4", + "rev": "29d760e2cc11b85c9238a9a1ae298837789d7607", "type": "github" }, "original": { @@ -2544,16 +2520,16 @@ "neutron-src_2": { "flake": false, "locked": { - "lastModified": 1685114240, - "narHash": "sha256-xHi4W4fOT3kTmkPEKdGp6JbzKQELdWy9PIn0qsZhprY=", + "lastModified": 1701174344, + "narHash": "sha256-NuoOlrciBeL2f/A7wlQBqYlYJhSYucXRhLgxdasfyhI=", "owner": "neutron-org", "repo": "neutron", - "rev": "3c8dde1ff524551e24295d393a3913c25199d265", + "rev": "e605ed3db4381994ee8185ba4a0ff0877d34e67f", "type": "github" }, "original": { "owner": "neutron-org", - "ref": "v1.0.2", + "ref": "v2.0.0", "repo": "neutron", "type": "github" } @@ -2769,11 +2745,11 @@ "nixpkgs-lib_4": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -2787,11 +2763,11 @@ "nixpkgs-lib_5": { "locked": { "dir": "lib", - "lastModified": 1678375444, - "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", + "lastModified": 1688049487, + "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", + "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", "type": "github" }, "original": { @@ -2802,39 +2778,41 @@ "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-lib_6": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "dir": "lib", + "lastModified": 1678375444, + "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e", "type": "github" }, "original": { + "dir": "lib", "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-regression": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -2929,11 +2907,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1699343069, - "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", + "lastModified": 1674990008, + "narHash": "sha256-4zOyp+hFW2Y7imxIpZqZGT8CEqKmDjwgfD6BzRUE0mQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d", + "rev": "d2bbcbe6c626d339b25a4995711f07625b508214", "type": "github" }, "original": { @@ -2945,11 +2923,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1699781429, - "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -3075,16 +3053,16 @@ "osmosis-src_2": { "flake": false, "locked": { - "lastModified": 1695859760, - "narHash": "sha256-Ad2Z4rzD0HQtnj2aQ4GD6ic5sxOHVPsaW4iNKZEDTiw=", + "lastModified": 1700576443, + "narHash": "sha256-UE3XEgdSp8mlgIKQRrBfb4wiPEeagB/wNWfDvDq4up4=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "38d1d2b748d161fd23f966d88b23b66a63c9a284", + "rev": "d9965b09d3e8690c77050bb095bc5b69772ebdfb", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v19.2.0", + "ref": "v20.4.0", "repo": "osmosis", "type": "github" } @@ -3092,7 +3070,7 @@ "polkadot": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -3113,48 +3091,18 @@ } }, "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "cvm", - "cosmos", - "flake-utils" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "cvm", - "cosmos", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1698227354, - "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { "inputs": { "flake-compat": [ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_5", - "gitignore": "gitignore_3", + "flake-utils": "flake-utils_4", + "gitignore": "gitignore_2", "nixpkgs": [ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1688056373, @@ -3172,7 +3120,7 @@ }, "process-compose": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs" ] @@ -3223,6 +3171,23 @@ "type": "github" } }, + "provenance-src_2": { + "flake": false, + "locked": { + "lastModified": 1699901286, + "narHash": "sha256-dTX3kg2QUsC9SwsaommP4IFgIdQgWZrGQNtp/B+fzys=", + "owner": "provenance-io", + "repo": "provenance", + "rev": "91b0813de2f93d03cefe8efb226dc32f02690840", + "type": "github" + }, + "original": { + "owner": "provenance-io", + "ref": "v1.17.0", + "repo": "provenance", + "type": "github" + } + }, "regen-src": { "flake": false, "locked": { @@ -3305,8 +3270,8 @@ "devenv": "devenv", "eth-pos-devnet-src": "eth-pos-devnet-src", "ethereum": "ethereum", - "flake-parts": "flake-parts_6", - "flake-utils": "flake-utils_7", + "flake-parts": "flake-parts_7", + "flake-utils": "flake-utils_6", "helix": "helix", "home-manager": "home-manager", "instrumental": "instrumental", @@ -3343,18 +3308,18 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "cvm", "nixpkgs" ] }, "locked": { - "lastModified": 1700100993, - "narHash": "sha256-Zc//DbR3eMGajG09iQUMTO/Tc/fdUYmTAzXYdxx5MKw=", + "lastModified": 1701656211, + "narHash": "sha256-lfFXsLWH4hVbEKR6K+UcDiKxeS6Lz4FkC1DZ9LHqf9Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7a041430733fccaa1ffc3724bb9454289d0f701", + "rev": "47a276e820ae4ae1b8d98a503bf09d2ceb52dfd8", "type": "github" }, "original": { @@ -3390,7 +3355,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_10", "nixpkgs": "nixpkgs_12" }, "locked": { @@ -3409,7 +3374,7 @@ }, "sbt-derivation": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -3788,36 +3753,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -3839,23 +3774,6 @@ "type": "github" } }, - "ts-relayer-src": { - "flake": false, - "locked": { - "lastModified": 1640291594, - "narHash": "sha256-mSI+qgB+e9YcFrcUAgHQnbXOQ8wxO2GmD0wNe+3ya0g=", - "owner": "confio", - "repo": "ts-relayer", - "rev": "23930794ddb64afcc80ac73ffe31ca69072c6549", - "type": "github" - }, - "original": { - "owner": "confio", - "ref": "v0.4.0", - "repo": "ts-relayer", - "type": "github" - } - }, "umee-src": { "flake": false, "locked": { @@ -3958,23 +3876,6 @@ "type": "github" } }, - "wasmvm_0_16_3-src": { - "flake": false, - "locked": { - "lastModified": 1640251271, - "narHash": "sha256-XvgAMDvAgzWaH7Q+mNZUBoaVhqAVlZ4ucIL0QFyNvWw=", - "owner": "CosmWasm", - "repo": "wasmvm", - "rev": "458e983721624548e66c0dcdd35140383966515e", - "type": "github" - }, - "original": { - "owner": "CosmWasm", - "ref": "v0.16.3", - "repo": "wasmvm", - "type": "github" - } - }, "wasmvm_1-src": { "flake": false, "locked": { @@ -4162,6 +4063,23 @@ "type": "github" } }, + "wasmvm_1_3_0-src_2": { + "flake": false, + "locked": { + "lastModified": 1689589428, + "narHash": "sha256-rsTYvbkYpDkUE4IvILdSL3hXMgAWxz5ltGotJB2t1e4=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "71a9c0dc0ecf9623148e82facb3564fbbf0a896f", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v1.3.0", + "repo": "wasmvm", + "type": "github" + } + }, "wasmvm_1_5_0-src": { "flake": false, "locked": { @@ -4179,6 +4097,23 @@ "type": "github" } }, + "wasmvm_1_5_0-src_2": { + "flake": false, + "locked": { + "lastModified": 1698746477, + "narHash": "sha256-l0cNF0YjviEl/JLJ4VdvDtIGuAYyFfncVo83ROfQFD8=", + "owner": "CosmWasm", + "repo": "wasmvm", + "rev": "2041b184c146f278157d195361bc6cc6b56cc9d4", + "type": "github" + }, + "original": { + "owner": "CosmWasm", + "ref": "v1.5.0", + "repo": "wasmvm", + "type": "github" + } + }, "wasmvm_1_beta7-src": { "flake": false, "locked": { @@ -4215,7 +4150,7 @@ }, "zombienet": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "nixpkgs": [ "nixpkgs" ] diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index d40cd22558..1c1a2fcf0c 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -31,59 +31,42 @@ runtimeInputs = devnetTools.withBaseContainerTools ++ [ neutrond pkgs.jq - self.inputs.cvm.packages."${system}".cw-cvm-executor - self.inputs.cvm.packages."${system}".cw-cvm-gateway ]; text = '' CHAIN_DATA="${devnet-root-directory}/.neutrond" ${bashTools.export pkgs.networksLib.neutron.devnet} KEYRING_TEST="$CHAIN_DATA/keyring-test" - KEY=${cosmosTools.cvm.centauri} function init_cvm() { local INSTANTIATE=$1 "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" GATEWAY_CODE_ID=1 sleep $BLOCK_SECONDS "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-executor - }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${ - self.inputs.cvm.packages."${system}".cw-mantis-order - }/lib/cw_mantis_order.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - ORDER_CODE_ID=4 - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${ - self.inputs.instrumental.packages."${system}".staking - }/lib/staking.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - # INSTRUMENTAL_STAKING_CODE_ID=5 - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $ORDER_CODE_ID "{}" "1234" --label "mantis-order" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE sleep $BLOCK_SECONDS - GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" - ORDER_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$ORDER_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + ORDER_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$ORDER_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$ORDER_CONTRACT_ADDRESS" > "$CHAIN_DATA/ORDER_CONTRACT_ADDRESS" echo "2" > "$CHAIN_DATA/interpreter_code_id" } + KEY="$($BINARY keys show APP_1 | jq .address --raw)" INSTANTIATE=$(cat << EOF { "admin" : "$KEY", @@ -123,6 +106,7 @@ echo "$RLY_MNEMONIC_1" | $BINARY keys add rly1 --home "$CHAIN_DATA" --recover --keyring-backend=test echo "$RLY_MNEMONIC_2" | $BINARY keys add rly2 --home "$CHAIN_DATA" --recover --keyring-backend=test echo "$RLY_MNEMONIC_4" | $BINARY keys add rly4 --home "$CHAIN_DATA" --recover --keyring-backend=test + echo "$APP_1" | $BINARY keys add APP_1 --home "$CHAIN_DATA" --recover --keyring-backend=test $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show val1 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show val2 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" @@ -132,6 +116,7 @@ $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show rly1 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show rly2 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show rly4 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" + $BINARY add-genesis-account "$($BINARY --home "$CHAIN_DATA" keys show APP_1 --keyring-backend test -a --home "$CHAIN_DATA")" "100000000000000$STAKEDENOM" --home "$CHAIN_DATA" sed -i -e 's/timeout_commit = "5s"/timeout_commit = "1s"/g' "$CHAIN_DATA/config/config.toml" sed -i -e 's/timeout_propose = "3s"/timeout_propose = "1s"/g' "$CHAIN_DATA/config/config.toml" diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index fe942679ef..7d4441c24b 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -147,13 +147,13 @@ dasel put --type string --file "$CONFIG_FOLDER/app.toml" --value "0.0.0.0:$GRPCWEB" '.grpc-web.address' dasel put --type string --file "$CONFIG_FOLDER/app.toml" --value "tcp://0.0.0.0:$RESTPORT" '.api.address' - dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value ":36660" '.instrumentation.prometheus_listen_addr' + dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value ":$PROMETHEUS_PORT" '.instrumentation.prometheus_listen_addr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "0.0.0.0:16060" '.rpc.pprof_laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$P2PPORT" '.p2p.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://0.0.0.0:$CONSENSUS_RPC_PORT" '.rpc.laddr' dasel put --type string --file "$CONFIG_FOLDER/config.toml" --value "tcp://127.0.0.1:36658" '.proxy_app' - dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$PORT" '.node' + dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$CONSENSUS_RPC_PORT" '.node' osmosisd start --home "$CHAIN_DATA" --rpc.unsafe --pruning=nothing --p2p.pex false --p2p.upnp false --p2p.seed_mode true --log_level trace --trace diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix index f7765f6fed..c1da345b9c 100644 --- a/flake/dev-shells.nix +++ b/flake/dev-shells.nix @@ -87,6 +87,35 @@ xc = pkgs.mkShell { buildInputs = tools ++ (with self'.packages; [ centaurid ]); }; + + + + neutron-devnet = self.inputs.devenv.lib.mkShell { + inherit pkgs; + inputs = self.inputs; + modules = [rec { + packages = [ self'.packages.neutrond ]; + env = pkgs.networksLib.neutron.devnet // { + DIR = "devnet/.neutrond"; + EXECUTOR_WASM_FILE = "${ + self.inputs.cvm.packages."${system}".cw-cvm-executor + }/lib/cw_cvm_executor.wasm"; + GATEWAY_WASM_FILE = "${ + self.inputs.cvm.packages."${system}".cw-cvm-gateway + }/lib/cw_cvm_gateway.wasm"; + }; + enterShell = '' + rm --force --recursive ~/.neutrond + mkdir --parents ~/.neutrond/config + echo 'keyring-backend = "test"' >> ~/.neutrond/config/client.toml + echo 'output = "json"' >> ~/.neutrond/config/client.toml + echo 'node = "${env.NODE}"' >> ~/.neutrond/config/client.toml + echo 'chain-id = "${env.CHAIN_ID}"' >> ~/.neutrond/config/client.toml + echo ${pkgs.networksLib.devnet.mnemonics.APP_1} | "$BINARY" keys add APP_1 --recover --keyring-backend test --output json + ''; + }]; + }; + centauri-devnet = self.inputs.devenv.lib.mkShell { inherit pkgs; inputs = self.inputs; diff --git a/flake/mantis.nix b/flake/mantis.nix index 0612730c52..d535920bf6 100644 --- a/flake/mantis.nix +++ b/flake/mantis.nix @@ -15,7 +15,7 @@ GATEWAY_CONTRACT_ADDRESS=$(cat "$CHAIN_DATA/gateway_contract_address") RUST_TRACE=trace mantis --rpc-centauri "http://localhost:26657" --grpc-centauri "http://localhost:9090" --osmosis "http://127.0.0.1:${ - builtins.toString pkgs.networksLib.osmosis.devnet.PORT + builtins.toString pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT }" --neutron "http://127.0.0.1:46657" --cvm-contract "$GATEWAY_CONTRACT_ADDRESS" --wallet "$WALLET" --order-contract "$ORDER_CONTRACT_ADDRESS" --simulate "100ppica,100pdemo" ''; }; From 4e469dd69e35a531976fa2fdaabbe9d0909348c9 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 19:07:45 +0000 Subject: [PATCH 10/23] gen --- code/parachain/frame/cosmwasm/cli/README.md | 2 +- flake/cosmos/neutron.nix | 33 +++++++++++++-------- inputs/CosmWasm/flake-module.nix | 16 ---------- 3 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 inputs/CosmWasm/flake-module.nix diff --git a/code/parachain/frame/cosmwasm/cli/README.md b/code/parachain/frame/cosmwasm/cli/README.md index cfb50577c0..0867818f92 100644 --- a/code/parachain/frame/cosmwasm/cli/README.md +++ b/code/parachain/frame/cosmwasm/cli/README.md @@ -22,7 +22,7 @@ Same as for [manual guide](../../../../../docs/docs/products/cosmwasm/deploy-and ### CW4 Stake ```shell -nix build .#cw4_stake +curl --location https://github.com/CosmWasm/cw-plus/releases/download/v1.1.0/cw4_stake.wasm > result ``` ```shell diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 1c1a2fcf0c..cff99d30a0 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -46,9 +46,7 @@ GATEWAY_CODE_ID=1 sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${ - self.inputs.cvm.packages."${system}".cw-cvm-executor - }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" @@ -187,6 +185,10 @@ CW4_VOTING_CONTRACT=$THIRD_PARTY_CONTRACTS_DIR/cw4_voting.wasm CW4_GROUP_CONTRACT=$THIRD_PARTY_CONTRACTS_DIR/cw4_group.wasm + # COMPOSABLE + CVM_EXECUTOR_CONTRACT="${self.inputs.cvm.packages."${system}".cw-cvm-executor}/lib/cw_cvm_executor.wasm" + CVM_GATEWAY_CONTRACT="${self.inputs.cvm.packages."${system}".cw-cvm-gateway}/lib/cw_cvm_gateway.wasm" + echo "Add consumer section..." $BINARY add-consumer-section --home "$CHAIN_DIR" ### PARAMETERS SECTION @@ -311,6 +313,10 @@ CW4_VOTING_CONTRACT_BINARY_ID=$(store_binary "$CW4_VOTING_CONTRACT") CW4_GROUP_CONTRACT_BINARY_ID=$(store_binary "$CW4_GROUP_CONTRACT") + # COMPOSABLE + CW_CVM_GATEWAY_CONTRACT_BINARY_ID=$(store_binary "$CW_CVM_GATEWAY_CONTRACT") + CW_CVM_EXECUTOR_CONTRACT_BINARY_ID=$(store_binary "$CW_CVM_EXECUTOR_CONTRACT") + # WARNING! # The following code is needed to pre-generate the contract addresses # Those addresses depend on the ORDER OF CONTRACTS INITIALIZATION @@ -344,15 +350,6 @@ PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr "$PROPOSAL_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS=$(genaddr "$PRE_PROPOSAL_OVERRULE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) - echo "$DAO_CONTRACT_ADDRESS" - echo "$VOTING_REGISTRY_CONTRACT_ADDRESS" - echo "$PROPOSAL_SINGLE_CONTRACT_ADDRESS" - echo "$PRE_PROPOSAL_CONTRACT_ADDRESS" - echo "$PROPOSAL_MULTIPLE_CONTRACT_ADDRESS" - echo "$PRE_PROPOSAL_MULTIPLE_CONTRACT_ADDRESS" - echo "$PROPOSAL_OVERRULE_CONTRACT_ADDRESS" - echo "$PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS" - # RESERVE RESERVE_CONTRACT_ADDRESS=$(genaddr "$RESERVE_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) DISTRIBUTION_CONTRACT_ADDRESS=$(genaddr "$DISTRIBUTION_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) @@ -372,6 +369,17 @@ GRANTS_SUBDAO_TIMELOCK_CONTRACT_ADDRESS=$(genaddr "$SUBDAO_TIMELOCK_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) + # COMPOSABLE + CW_CVM_GATEWAY_CONTRACT_ADDRESS=$(genaddr "$CW_CVM_EXECUTOR_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) + + echo "$DAO_CONTRACT_ADDRESS" + echo "$VOTING_REGISTRY_CONTRACT_ADDRESS" + echo "$PROPOSAL_SINGLE_CONTRACT_ADDRESS" + echo "$PRE_PROPOSAL_CONTRACT_ADDRESS" + echo "$PROPOSAL_MULTIPLE_CONTRACT_ADDRESS" + echo "$PRE_PROPOSAL_MULTIPLE_CONTRACT_ADDRESS" + echo "$PROPOSAL_OVERRULE_CONTRACT_ADDRESS" + echo "$PRE_PROPOSAL_OVERRULE_CONTRACT_ADDRESS" echo "$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS" echo "$SECURITY_SUBDAO_VOTING_CONTRACT_ADDRESS" echo "$SECURITY_SUBDAO_GROUP_CONTRACT_ADDRESS" @@ -383,6 +391,7 @@ echo "$GRANTS_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS" echo "$GRANTS_SUBDAO_TIMELOCK_CONTRACT_ADDRESS" echo "$GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS" + echo "$CW_CVM_GATEWAY_CONTRACT_ADDRESS" function check_json() { MSG=$1 diff --git a/inputs/CosmWasm/flake-module.nix b/inputs/CosmWasm/flake-module.nix deleted file mode 100644 index e43c30e363..0000000000 --- a/inputs/CosmWasm/flake-module.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ self, ... }: { - perSystem = { config, self', inputs', pkgs, system, lib, crane, ... }: { - packages = rec { - cw20_base = pkgs.fetchurl { - url = - "https://github.com/CosmWasm/cw-plus/releases/download/v1.1.0/cw20_base.wasm"; - hash = "sha256-no9YPaUjE3fjYzLFhWpW1lOqCuIoR1K/EavSsORoUq4="; - }; - cw4_stake = pkgs.fetchurl { - url = - "https://github.com/CosmWasm/cw-plus/releases/download/v1.1.0/cw4_stake.wasm"; - hash = "sha256-iptZCkOVlZSCy5XlSbtV388+/bUSdovSIztVoJmAQ8Y="; - }; - }; - }; -} From 40074f34f46e50294f0ed83fe369ee577283ddf2 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 19:31:55 +0000 Subject: [PATCH 11/23] instance --- flake.nix | 3 +-- flake/cosmos/neutron.nix | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 5f5ef9fb54..98af2f5254 100644 --- a/flake.nix +++ b/flake.nix @@ -171,8 +171,7 @@ ./inputs/AcalaNetwork/acala.nix ./inputs/bifrost-finance/bifrost/flake-module.nix ./inputs/ComposableFi/composable-ibc/flake-module.nix - ./inputs/ComposableFi/composable-cosmos/flake-module.nix - ./inputs/CosmWasm/flake-module.nix + ./inputs/ComposableFi/composable-cosmos/flake-module.nix ./inputs/paritytech/cumulus.nix ./inputs/paritytech/polkadot.nix ./inputs/paritytech/substrate.nix diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index cff99d30a0..d2c6861407 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -42,7 +42,7 @@ local INSTANTIATE=$1 "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" GATEWAY_CODE_ID=1 sleep $BLOCK_SECONDS @@ -58,9 +58,6 @@ GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" - ORDER_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$ORDER_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) - echo "$ORDER_CONTRACT_ADDRESS" > "$CHAIN_DATA/ORDER_CONTRACT_ADDRESS" - echo "2" > "$CHAIN_DATA/interpreter_code_id" } @@ -314,8 +311,8 @@ CW4_GROUP_CONTRACT_BINARY_ID=$(store_binary "$CW4_GROUP_CONTRACT") # COMPOSABLE - CW_CVM_GATEWAY_CONTRACT_BINARY_ID=$(store_binary "$CW_CVM_GATEWAY_CONTRACT") - CW_CVM_EXECUTOR_CONTRACT_BINARY_ID=$(store_binary "$CW_CVM_EXECUTOR_CONTRACT") + CVM_GATEWAY_CONTRACT_BINARY_ID=$(store_binary "$CVM_GATEWAY_CONTRACT") + CVM_EXECUTOR_CONTRACT_BINARY_ID=$(store_binary "$CVM_EXECUTOR_CONTRACT") # WARNING! # The following code is needed to pre-generate the contract addresses @@ -370,7 +367,7 @@ GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS=$(genaddr "$CW4_GROUP_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) # COMPOSABLE - CW_CVM_GATEWAY_CONTRACT_ADDRESS=$(genaddr "$CW_CVM_EXECUTOR_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) + CVM_GATEWAY_CONTRACT_ADDRESS=$(genaddr "$CVM_EXECUTOR_CONTRACT_BINARY_ID") && (( INSTANCE_ID_COUNTER++ )) echo "$DAO_CONTRACT_ADDRESS" echo "$VOTING_REGISTRY_CONTRACT_ADDRESS" @@ -391,7 +388,7 @@ echo "$GRANTS_SUBDAO_PRE_PROPOSE_CONTRACT_ADDRESS" echo "$GRANTS_SUBDAO_TIMELOCK_CONTRACT_ADDRESS" echo "$GRANTS_SUBDAO_GROUP_CONTRACT_ADDRESS" - echo "$CW_CVM_GATEWAY_CONTRACT_ADDRESS" + echo "$CVM_GATEWAY_CONTRACT_ADDRESS" function check_json() { MSG=$1 @@ -776,6 +773,13 @@ "security_dao": "'"$SECURITY_SUBDAO_CORE_CONTRACT_ADDRESS"'" }' + CVM_ADMIN=$($BINARY keys show APP_1 --keyring-backend test --home "$CHAIN_DATA" --output json | jq .address) + echo "$CVM_ADMIN" + CVM_GATEWAY_INIT_MSG='{ + "admin": '"$CVM_ADMIN"', + "network_id": '$NETWORK_ID' + }' + echo "Instantiate contracts" function init_contract() { @@ -800,6 +804,11 @@ init_contract "$SUBDAO_CORE_BINARY_ID" "$SECURITY_SUBDAO_CORE_INIT_MSG" "$SECURITY_SUBDAO_CORE_LABEL" init_contract "$SUBDAO_CORE_BINARY_ID" "$GRANTS_SUBDAO_CORE_INIT_MSG" "$GRANTS_SUBDAO_CORE_LABEL" + init_contract "$CVM_GATEWAY_CONTRACT_BINARY_ID" "$CVM_GATEWAY_INIT_MSG" "composable.cvm.gateway" + + echo "$CVM_GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" + echo "$CVM_EXECUTOR_CONTRACT_BINARY_ID" > "$CHAIN_DATA/interpreter_code_id" + ADD_SUBDAOS_MSG='{ "update_sub_daos": { "to_add": [ From ed86edcc1a556fd9a4f78ef89055448d4f5b550d Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 20:46:46 +0000 Subject: [PATCH 12/23] init --- code/composable-nodes.nix | 2 +- flake/devnets/cosmos.nix | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/code/composable-nodes.nix b/code/composable-nodes.nix index b0513ac85b..f2611b5c89 100644 --- a/code/composable-nodes.nix +++ b/code/composable-nodes.nix @@ -35,7 +35,7 @@ CW_CVM_EXECUTOR_WASM_PATH = "${ self.inputs.cvm.packages."${system}".cw-cvm-executor }/lib/cw_cvm_executor.wasm"; - CW_20_BASE_WASM_PATH = self'.packages.cw20_base; + CW_20_BASE_WASM_PATH = "${self.cosmos.packages.${system}.cw20-base}/lib/cw20_base.wasm"; PICASSO_RUNTIME = "${picasso-runtime}/lib/runtime.optimized.wasm"; COMPOSABLE_RUNTIME = "${composable-runtime}/lib/runtime.optimized.wasm"; diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index 04054fa7c0..2f405b9779 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -8,6 +8,18 @@ , networks , }: +let + depends-on-cvm-init = + { + depends_on."centauri-cvm-init".condition = + "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = + "process_completed_successfully"; + depends_on."neutron-cvm-init".condition = + "process_completed_successfully"; + + }; +in { settings = { log_level = "trace"; @@ -153,18 +165,14 @@ log_location = "${devnet-root-directory}/centauri-cvm-config.log"; availability = { restart = chain-restart; }; - }; + } // depends-on-cvm-init; osmosis-cvm-config = { command = self'.packages.osmosisd-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; log_location = "${devnet-root-directory}/osmosis-cvm-config.log"; availability = { restart = chain-restart; }; - }; + } // depends-on-cvm-init; osmosis = { command = self'.packages.osmosisd-gen; From 2ebf1ddf0631e1ff9db67de443c3887bb11b310c Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 20:54:29 +0000 Subject: [PATCH 13/23] up --- .github/workflows/release-docs.yml | 10 +- code/composable-nodes.nix | 4 +- flake.lock | 312 ++++++++++-------- flake.nix | 5 +- flake/cosmos/neutron.nix | 100 +++--- flake/dev-shells.nix | 2 - flake/devnets/cosmos.nix | 83 ++--- flake/devnets/flake-module.nix | 5 +- flake/mantis.nix | 3 +- .../composable-cosmos/flake-module.nix | 2 +- 10 files changed, 257 insertions(+), 269 deletions(-) diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml index c19de72ff5..b7a86d603e 100644 --- a/.github/workflows/release-docs.yml +++ b/.github/workflows/release-docs.yml @@ -17,15 +17,9 @@ env: CACHIX_COMPRESSION_LEVEL: 16 CACHIX_JOBS: 8 CACHIX_COMPRESSION_METHOD: zstd - CACHIX_NAME: composable - - DOCKER_REGISTRY_NAME: composablefi - # weird, next is implicit dependency of docker action - DOCKER_USER_OPTION: '$UID:$GID' - + jobs: - # this is not flaky!!! deploy-docs: name: "deploy-docs" runs-on: ubuntu-latest @@ -55,7 +49,7 @@ jobs: run: | nix-channel --add https://nixos.org/channels/${{ env.NIXPKGS_CHANNEL }} nixpkgs nix-channel --update - nix-env -iA nixpkgs.cachix nixpkgs.nodejs nixpkgs.git nixpkgs.git-lfs nixpkgs.tree nixpkgs.docker + nix-env -iA nixpkgs.cachix nixpkgs.nodejs nixpkgs.git nixpkgs.git-lfs - uses: actions/checkout@v3 if: ${{ github.event_name == 'push' || (inputs.github_event_name == 'pull_request' && inputs.github_event_pull_request_head_repo_id == 383289760) }} with: diff --git a/code/composable-nodes.nix b/code/composable-nodes.nix index f2611b5c89..3f4db83ea6 100644 --- a/code/composable-nodes.nix +++ b/code/composable-nodes.nix @@ -35,7 +35,9 @@ CW_CVM_EXECUTOR_WASM_PATH = "${ self.inputs.cvm.packages."${system}".cw-cvm-executor }/lib/cw_cvm_executor.wasm"; - CW_20_BASE_WASM_PATH = "${self.cosmos.packages.${system}.cw20-base}/lib/cw20_base.wasm"; + CW_20_BASE_WASM_PATH = "${ + self.inputs.cosmos.packages.${system}.cw20-base + }/lib/cw20_base.wasm"; PICASSO_RUNTIME = "${picasso-runtime}/lib/runtime.optimized.wasm"; COMPOSABLE_RUNTIME = "${composable-runtime}/lib/runtime.optimized.wasm"; diff --git a/flake.lock b/flake.lock index 5de4e68e5a..d5499119ff 100644 --- a/flake.lock +++ b/flake.lock @@ -595,26 +595,17 @@ }, "crane_3": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1701025348, + "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b", "type": "github" }, "original": { @@ -721,11 +712,11 @@ ] }, "locked": { - "lastModified": 1689825754, - "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -743,11 +734,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1699541523, - "narHash": "sha256-Rv0ryuBC5KtA/3YqwIEe58Tabu71qSGnGcGRd67mMUY=", + "lastModified": 1701187605, + "narHash": "sha256-NctguPdUeDVLXFsv6vI1RlEiHLsXkeW3pgZe/mwn1BU=", "owner": "cachix", "repo": "devenv", - "rev": "14fdefc0bb80c3d6f3a18a491e33429b4064c371", + "rev": "a7c4dd8f4eb1f98a6b8f04bf08364954e1e73e4f", "type": "github" }, "original": { @@ -823,7 +814,6 @@ "original": { "owner": "OffchainLabs", "repo": "eth-pos-devnet", - "rev": "4f4c28e71fd39bc50788dc1b858c1cc6b983defb", "type": "github" } }, @@ -835,17 +825,18 @@ "flake-parts": "flake-parts_5", "flake-root": "flake-root", "foundry-nix": "foundry-nix", - "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_7", + "lib-extras": "lib-extras", + "mynixpkgs": "mynixpkgs", + "nixpkgs": "nixpkgs_6", "nixpkgs-unstable": "nixpkgs-unstable", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1699467156, - "narHash": "sha256-ZbSEhRoi8r5x9TMn3K50BXDNgt+V2WC8bKeaBEXDYu8=", + "lastModified": 1701261481, + "narHash": "sha256-3wB5yK3Sb0XtcoKJi/iBxqn4PAuvcJvHnPVy43g1U3Y=", "owner": "nix-community", "repo": "ethereum.nix", - "rev": "937779bd71c73dcde22520f7475714796b0a28a3", + "rev": "1f8b13ca5282b0f304fa8edb4da42fd46f7af0b0", "type": "github" }, "original": { @@ -941,22 +932,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1049,27 +1024,6 @@ } }, "flake-parts_6": { - "inputs": { - "nixpkgs-lib": [ - "ethereum", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_7": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, @@ -1087,7 +1041,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_6" }, @@ -1242,11 +1196,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -1794,43 +1748,47 @@ "type": "github" } }, - "helix": { + "haumea": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_2" + "nixpkgs": [ + "ethereum", + "mynixpkgs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1699520217, - "narHash": "sha256-+b4R/GUQrRBGGpmDXna8w28ueeK7FhIYhQTSHqFJuqo=", - "owner": "helix-editor", - "repo": "helix", - "rev": "6ab774da0b473c36a437d90abcdac3558353d32e", + "lastModified": 1685133229, + "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", + "owner": "nix-community", + "repo": "haumea", + "rev": "34dd58385092a23018748b50f9b23de6266dffc2", "type": "github" }, "original": { - "owner": "helix-editor", - "repo": "helix", + "owner": "nix-community", + "ref": "v0.2.2", + "repo": "haumea", "type": "github" } }, - "hercules-ci-effects": { + "helix": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_6" + "crane": "crane_3", + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1698165573, - "narHash": "sha256-cnMTgCDnZiQKsf+wVzigpexskqRCFTKgS58Wx2rNU1c=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "300e0af24a1bbe32d115beb182efb01785582c45", + "lastModified": 1701875994, + "narHash": "sha256-iHID4VbI2QyBzbG6WNgS1zZgU0zYzidhI72PeAl1aLw=", + "owner": "helix-editor", + "repo": "helix", + "rev": "b81aacc5e1332bb01043a18e55dd9e9543711ec6", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", + "owner": "helix-editor", + "repo": "helix", "type": "github" } }, @@ -1875,11 +1833,11 @@ ] }, "locked": { - "lastModified": 1699783872, - "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "280721186ab75a76537713ec310306f0eba3e407", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -2432,6 +2390,44 @@ "type": "github" } }, + "lib-extras": { + "inputs": { + "devshell": [ + "ethereum", + "devshell" + ], + "flake-parts": [ + "ethereum", + "flake-parts" + ], + "flake-root": [ + "ethereum", + "flake-root" + ], + "nixpkgs": [ + "ethereum", + "nixpkgs" + ], + "treefmt-nix": [ + "ethereum", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1699974671, + "narHash": "sha256-4EsuPiX4pGEg8ME9ONn8ebY1ZKYLOp9DRCcdTrOj8sY=", + "owner": "aldoborrero", + "repo": "lib-extras", + "rev": "83c8935af27738b8b155e0077522220d81865269", + "type": "github" + }, + "original": { + "owner": "aldoborrero", + "ref": "v0.2.2", + "repo": "lib-extras", + "type": "github" + } + }, "lowdown-src": { "flake": false, "locked": { @@ -2482,9 +2478,55 @@ "type": "github" } }, + "mynixpkgs": { + "inputs": { + "devour-flake": [ + "ethereum", + "devour-flake" + ], + "devshell": [ + "ethereum", + "devshell" + ], + "flake-parts": [ + "ethereum", + "flake-parts" + ], + "flake-root": [ + "ethereum", + "flake-root" + ], + "haumea": "haumea", + "lib-extras": [ + "ethereum", + "lib-extras" + ], + "nixpkgs": [ + "ethereum", + "nixpkgs-unstable" + ], + "treefmt-nix": [ + "ethereum", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1701258184, + "narHash": "sha256-RAmIb5DVd4I4jn0Nzwd0iPmO4YZwzsx7Wno5a30k8IM=", + "owner": "aldoborrero", + "repo": "mynixpkgs", + "rev": "0d415cfc494dfc105a0fd5ebf83411be82a4d9b3", + "type": "github" + }, + "original": { + "owner": "aldoborrero", + "repo": "mynixpkgs", + "type": "github" + } + }, "networks": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1701970087, @@ -2625,11 +2667,11 @@ }, "nix-std_3": { "locked": { - "lastModified": 1685917625, - "narHash": "sha256-2manVKofCZrCToVDnDYNvtYUFBYOM5JhdDoNGVY4fq4=", + "lastModified": 1701658249, + "narHash": "sha256-KIt1TUuBvldhaVRta010MI5FeQlB8WadjqljybjesN0=", "owner": "chessai", "repo": "nix-std", - "rev": "e20af8822b5739434b875643bfc61fe0195ea2fb", + "rev": "715db541ffff4194620e48d210b76f73a74b5b5d", "type": "github" }, "original": { @@ -2845,22 +2887,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1653917367, "narHash": "sha256-04MsJC0g9kE01nBuXThMppZK+yvCZECQnUaZKSU+HJo=", @@ -2874,7 +2900,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -2954,22 +2980,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1685566663, "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", @@ -2985,13 +2995,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -3001,7 +3011,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1701174899, "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", @@ -3015,9 +3025,25 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "npm-buildpackage": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1686315622, @@ -3141,11 +3167,11 @@ }, "process-compose-flake": { "locked": { - "lastModified": 1698517360, - "narHash": "sha256-u10MVmhHEqVa0u5TnZzeprjfZgB5H/2JDBoIyeNyR+c=", + "lastModified": 1701368682, + "narHash": "sha256-YkZbzfOkv68YOX4fK6VQvNHpysyZ/x3gePL3wbo8giA=", "owner": "Platonic-Systems", "repo": "process-compose-flake", - "rev": "ea1607cead57ce72dd06e178b4d55884a3be8854", + "rev": "8edcd4de7c631eac2ce5f8e2a0782e0ca606da9b", "type": "github" }, "original": { @@ -3270,7 +3296,7 @@ "devenv": "devenv", "eth-pos-devnet-src": "eth-pos-devnet-src", "ethereum": "ethereum", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "flake-utils": "flake-utils_6", "helix": "helix", "home-manager": "home-manager", @@ -3278,7 +3304,7 @@ "networks": "networks", "neutron-src": "neutron-src_3", "nix-std": "nix-std_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-latest": "nixpkgs-latest", "npm-buildpackage": "npm-buildpackage", "polkadot": "polkadot", @@ -3340,11 +3366,11 @@ ] }, "locked": { - "lastModified": 1690424156, - "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", + "lastModified": 1701137803, + "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", + "rev": "9dd940c967502f844eacea52a61e9596268d4f70", "type": "github" }, "original": { @@ -3356,7 +3382,7 @@ "rust-overlay_3": { "inputs": { "flake-utils": "flake-utils_10", - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1700084394, @@ -4150,7 +4176,7 @@ }, "zombienet": { "inputs": { - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 98af2f5254..f7a1902363 100644 --- a/flake.nix +++ b/flake.nix @@ -95,8 +95,7 @@ eth-pos-devnet-src = { flake = false; - url = - "github:OffchainLabs/eth-pos-devnet/4f4c28e71fd39bc50788dc1b858c1cc6b983defb"; + url = "github:OffchainLabs/eth-pos-devnet"; }; neutron-src.url = "github:neutron-org/neutron/v2.0.0"; @@ -171,7 +170,7 @@ ./inputs/AcalaNetwork/acala.nix ./inputs/bifrost-finance/bifrost/flake-module.nix ./inputs/ComposableFi/composable-ibc/flake-module.nix - ./inputs/ComposableFi/composable-cosmos/flake-module.nix + ./inputs/ComposableFi/composable-cosmos/flake-module.nix ./inputs/paritytech/cumulus.nix ./inputs/paritytech/polkadot.nix ./inputs/paritytech/substrate.nix diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index d2c6861407..9fbda2d8ef 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -26,53 +26,51 @@ ''; }; - neutron-cvm-init = pkgs.writeShellApplication { - name = "neutron-cvm-init"; - runtimeInputs = devnetTools.withBaseContainerTools ++ [ - neutrond - pkgs.jq - ]; - - text = '' - CHAIN_DATA="${devnet-root-directory}/.neutrond" - ${bashTools.export pkgs.networksLib.neutron.devnet} - KEYRING_TEST="$CHAIN_DATA/keyring-test" - - function init_cvm() { - local INSTANTIATE=$1 - "$BINARY" tx wasm store "${ - self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - GATEWAY_CODE_ID=1 - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE - - sleep $BLOCK_SECONDS - GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) - echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" - - echo "2" > "$CHAIN_DATA/interpreter_code_id" - } - - KEY="$($BINARY keys show APP_1 | jq .address --raw)" - INSTANTIATE=$(cat << EOF - { - "admin" : "$KEY", - "network_id" : $NETWORK_ID - } - EOF - ) + neutron-cvm-init = pkgs.writeShellApplication { + name = "neutron-cvm-init"; + runtimeInputs = devnetTools.withBaseContainerTools + ++ [ neutrond pkgs.jq ]; - init_cvm "$INSTANTIATE" - ''; - }; + text = '' + CHAIN_DATA="${devnet-root-directory}/.neutrond" + ${bashTools.export pkgs.networksLib.neutron.devnet} + KEYRING_TEST="$CHAIN_DATA/keyring-test" + + function init_cvm() { + local INSTANTIATE=$1 + "$BINARY" tx wasm store "${ + self.inputs.cvm.packages."${system}".cw-cvm-gateway + }/lib/cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + GATEWAY_CODE_ID=1 + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + + sleep $BLOCK_SECONDS + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + + sleep $BLOCK_SECONDS + GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) + echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" + + echo "2" > "$CHAIN_DATA/interpreter_code_id" + } + + KEY="$($BINARY keys show APP_1 | jq .address --raw)" + INSTANTIATE=$(cat << EOF + { + "admin" : "$KEY", + "network_id" : $NETWORK_ID + } + EOF + ) + + init_cvm "$INSTANTIATE" + ''; + }; neutron-gen = pkgs.writeShellApplication { name = "neutron-gen"; @@ -183,9 +181,13 @@ CW4_GROUP_CONTRACT=$THIRD_PARTY_CONTRACTS_DIR/cw4_group.wasm # COMPOSABLE - CVM_EXECUTOR_CONTRACT="${self.inputs.cvm.packages."${system}".cw-cvm-executor}/lib/cw_cvm_executor.wasm" - CVM_GATEWAY_CONTRACT="${self.inputs.cvm.packages."${system}".cw-cvm-gateway}/lib/cw_cvm_gateway.wasm" - + CVM_EXECUTOR_CONTRACT="${ + self.inputs.cvm.packages."${system}".cw-cvm-executor + }/lib/cw_cvm_executor.wasm" + CVM_GATEWAY_CONTRACT="${ + self.inputs.cvm.packages."${system}".cw-cvm-gateway + }/lib/cw_cvm_gateway.wasm" + echo "Add consumer section..." $BINARY add-consumer-section --home "$CHAIN_DIR" ### PARAMETERS SECTION diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix index c1da345b9c..43d9f349d9 100644 --- a/flake/dev-shells.nix +++ b/flake/dev-shells.nix @@ -88,8 +88,6 @@ buildInputs = tools ++ (with self'.packages; [ centaurid ]); }; - - neutron-devnet = self.inputs.devenv.lib.mkShell { inherit pkgs; inputs = self.inputs; diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index 2f405b9779..791e0661da 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -1,26 +1,13 @@ -{ pkgs -, devnet-root-directory -, self' -, chain-restart -, parachain-startup -, relay -, devnetTools -, networks -, -}: +{ pkgs, devnet-root-directory, self', chain-restart, parachain-startup, relay +, devnetTools, networks, }: let - depends-on-cvm-init = - { - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; - depends_on."neutron-cvm-init".condition = - "process_completed_successfully"; + depends-on-cvm-init = { + depends_on."centauri-cvm-init".condition = "process_completed_successfully"; + depends_on."osmosis-cvm-init".condition = "process_completed_successfully"; + depends_on."neutron-cvm-init".condition = "process_completed_successfully"; - }; -in -{ + }; +in { settings = { log_level = "trace"; log_location = "/tmp/composable-devnet/pc.log"; @@ -49,8 +36,7 @@ in }; log_location = "${devnet-root-directory}/neutron-start.log"; availability = { restart = chain-restart; }; - depends_on."neutron-init".condition = - "process_completed_successfully"; + depends_on."neutron-init".condition = "process_completed_successfully"; }; cosmos-hub-init = { @@ -75,8 +61,7 @@ in neutron-cosmos-hub-init = { command = self'.packages.neutron-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/neutron-cosmos-hub-init.log"; + log_location = "${devnet-root-directory}/neutron-cosmos-hub-init.log"; availability = { restart = relay; }; depends_on."neutron".condition = "process_healthy"; depends_on."cosmos-hub".condition = "process_healthy"; @@ -85,8 +70,7 @@ in cosmos-hub-neutron-relay = { command = self'.packages.neutron-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; + log_location = "${devnet-root-directory}/cosmos-hub-neutron-relay.log"; availability = { restart = relay; }; depends_on."neutron".condition = "process_healthy"; depends_on."cosmos-hub".condition = "process_healthy"; @@ -97,8 +81,7 @@ in centauri-neutron-init = { command = self'.packages.neutron-centauri-hermes-init; - log_location = - "${devnet-root-directory}/centauri-neutron-init.log"; + log_location = "${devnet-root-directory}/centauri-neutron-init.log"; availability = { restart = relay; }; depends_on."neutron".condition = "process_healthy"; depends_on."osmosis-centauri-init".condition = @@ -110,8 +93,7 @@ in centauri-cosmos-hub-init = { command = self'.packages.centauri-cosmos-hub-hermes-init; - log_location = - "${devnet-root-directory}/centauri-cosmos-hub-init.log"; + log_location = "${devnet-root-directory}/centauri-cosmos-hub-init.log"; availability = { restart = relay; }; depends_on."centauri".condition = "process_healthy"; depends_on."cosmos-hub".condition = "process_healthy"; @@ -122,8 +104,7 @@ in centauri-cosmos-hub-relay = { command = self'.packages.centauri-cosmos-hub-hermes-relay; - log_location = - "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; + log_location = "${devnet-root-directory}/cosmos-hub-centauri-relay.log"; availability = { restart = relay; }; depends_on."cosmos-hub".condition = "process_healthy"; depends_on."cosmos-hub-centauri-init".condition = @@ -133,8 +114,7 @@ in centauri-neutron-relay = { command = self'.packages.centauri-neutron-hermes-relay; - log_location = - "${devnet-root-directory}/neutron-centauri-relay.log"; + log_location = "${devnet-root-directory}/neutron-centauri-relay.log"; availability = { restart = relay; }; depends_on."neutron".condition = "process_healthy"; depends_on."neutron-centauri-init".condition = @@ -162,15 +142,13 @@ in "process_completed_successfully"; depends_on."osmosis-cvm-init".condition = "process_completed_successfully"; - log_location = - "${devnet-root-directory}/centauri-cvm-config.log"; + log_location = "${devnet-root-directory}/centauri-cvm-config.log"; availability = { restart = chain-restart; }; } // depends-on-cvm-init; osmosis-cvm-config = { command = self'.packages.osmosisd-cvm-config; - log_location = - "${devnet-root-directory}/osmosis-cvm-config.log"; + log_location = "${devnet-root-directory}/osmosis-cvm-config.log"; availability = { restart = chain-restart; }; } // depends-on-cvm-init; @@ -185,8 +163,7 @@ in osmosis-pools-init = { command = self'.packages.osmosisd-pools-init; depends_on."osmosis".condition = "process_healthy"; - log_location = - "${devnet-root-directory}/osmosisd-pools-init.log"; + log_location = "${devnet-root-directory}/osmosisd-pools-init.log"; availability = { restart = chain-restart; }; }; osmosis-cvm-init = { @@ -204,19 +181,16 @@ in "osmosis".condition = "process_healthy"; }; namespace = "trustless-relay"; - log_location = - "${devnet-root-directory}/osmosis-centauri-init.log"; + log_location = "${devnet-root-directory}/osmosis-centauri-init.log"; availability = { restart = relay; }; }; osmosis-centauri-relay = { command = self'.packages.osmosis-centauri-hermes-relay; depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; + "osmosis-centauri-init".condition = "process_completed_successfully"; }; - log_location = - "${devnet-root-directory}/osmosis-centauri-relay.log"; + log_location = "${devnet-root-directory}/osmosis-centauri-relay.log"; availability = { restart = relay; }; namespace = "trustless-relay"; }; @@ -224,13 +198,10 @@ in mantis-simulate-solve = { command = self'.packages.mantis-simulate-solve; depends_on = { - "centauri-cvm-config".condition = - "process_completed_successfully"; - "osmosis-centauri-init".condition = - "process_completed_successfully"; + "centauri-cvm-config".condition = "process_completed_successfully"; + "osmosis-centauri-init".condition = "process_completed_successfully"; }; - log_location = - "${devnet-root-directory}/mantis-simulate-solve.log"; + log_location = "${devnet-root-directory}/mantis-simulate-solve.log"; availability = { restart = relay; }; namespace = "xapp"; }; @@ -238,8 +209,7 @@ in xapp-osmosis-osmo-to-centauri = { command = self'.packages.xapp-osmosis-osmo-to-centauri; depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; + "osmosis-centauri-init".condition = "process_completed_successfully"; }; log_location = "${devnet-root-directory}/xapp-osmosis-osmo-to-centauri.log"; @@ -249,8 +219,7 @@ in xapp-centauri-pica-to-osmosis = { command = self'.packages.xapp-centauri-pica-to-osmosis; depends_on = { - "osmosis-centauri-init".condition = - "process_completed_successfully"; + "osmosis-centauri-init".condition = "process_completed_successfully"; }; log_location = "${devnet-root-directory}/xapp-centauri-pica-to-osmosis.log"; diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index 1d9b6b3def..47bbd15715 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -13,8 +13,7 @@ failure_threshold = 16; timeout_seconds = 4; }; - in - { + in { packages = rec { @@ -472,7 +471,6 @@ parachain-startup relay devnetTools; }; - devnet-cosmos = import ./cosmos.nix { inherit pkgs devnet-root-directory self' chain-restart parachain-startup relay devnetTools networks; @@ -480,7 +478,6 @@ devnet-cosmos-background = devnet-cosmos // { tui = false; }; - }; }; } diff --git a/flake/mantis.nix b/flake/mantis.nix index d535920bf6..10f253fe3a 100644 --- a/flake/mantis.nix +++ b/flake/mantis.nix @@ -15,7 +15,8 @@ GATEWAY_CONTRACT_ADDRESS=$(cat "$CHAIN_DATA/gateway_contract_address") RUST_TRACE=trace mantis --rpc-centauri "http://localhost:26657" --grpc-centauri "http://localhost:9090" --osmosis "http://127.0.0.1:${ - builtins.toString pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT + builtins.toString + pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT }" --neutron "http://127.0.0.1:46657" --cvm-contract "$GATEWAY_CONTRACT_ADDRESS" --wallet "$WALLET" --order-contract "$ORDER_CONTRACT_ADDRESS" --simulate "100ppica,100pdemo" ''; }; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index 9bbdb2ae2d..931ff28fa8 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -138,7 +138,7 @@ ''; }; - centaurid-cvm-init = pkgs.writeShellApplication { + centaurid-cvm-init = pkgs.writeShellApplication { name = "centaurid-cvm-init"; runtimeInputs = devnetTools.withBaseContainerTools ++ [ centaurid From 5f2f87e42e387fffdde4aff2a01e5346a5f3a011 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 21:03:35 +0000 Subject: [PATCH 14/23] fixes --- flake/cosmos/neutron.nix | 46 ------------------- flake/cosmos/osmosis.nix | 4 +- flake/devnets/cosmos.nix | 6 +++ flake/devnets/flake-module.nix | 2 +- .../composable-cosmos/flake-module.nix | 4 +- 5 files changed, 13 insertions(+), 49 deletions(-) diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 9fbda2d8ef..9f2df659f8 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -26,52 +26,6 @@ ''; }; - neutron-cvm-init = pkgs.writeShellApplication { - name = "neutron-cvm-init"; - runtimeInputs = devnetTools.withBaseContainerTools - ++ [ neutrond pkgs.jq ]; - - text = '' - CHAIN_DATA="${devnet-root-directory}/.neutrond" - ${bashTools.export pkgs.networksLib.neutron.devnet} - KEYRING_TEST="$CHAIN_DATA/keyring-test" - - function init_cvm() { - local INSTANTIATE=$1 - "$BINARY" tx wasm store "${ - self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - GATEWAY_CODE_ID=1 - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE - - sleep $BLOCK_SECONDS - GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) - echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" - - echo "2" > "$CHAIN_DATA/interpreter_code_id" - } - - KEY="$($BINARY keys show APP_1 | jq .address --raw)" - INSTANTIATE=$(cat << EOF - { - "admin" : "$KEY", - "network_id" : $NETWORK_ID - } - EOF - ) - - init_cvm "$INSTANTIATE" - ''; - }; - neutron-gen = pkgs.writeShellApplication { name = "neutron-gen"; runtimeInputs = devnetTools.withBaseContainerTools diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index 7d4441c24b..7c45e18080 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -196,7 +196,9 @@ INTERPRETER_CODE_ID=2 sleep "$BLOCK_SECONDS" - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store ${ + self.inputs.cosmos.packages.${system}.cw20-base + }/lib/cw20_base.wasm --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep "$BLOCK_SECONDS" diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index 791e0661da..2ab7c6a104 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -152,6 +152,12 @@ in { availability = { restart = chain-restart; }; } // depends-on-cvm-init; + # neutron-cvm-config = { + # command = self'.packages.neutrond-cvm-config; + # log_location = "${devnet-root-directory}/neutron-cvm-config.log"; + # availability = { restart = chain-restart; }; + # } // depends-on-cvm-init; + osmosis = { command = self'.packages.osmosisd-gen; readiness_probe.http_get = { diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index 47bbd15715..39d7ca7d78 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -302,7 +302,7 @@ command = self'.packages.osmosisd-gen; readiness_probe.http_get = { host = "127.0.0.1"; - port = pkgs.networksLib.osmosis.devnet.PORT; + port = pkgs.networksLib.osmosis.devnet.CONSENSUS_RPC_PORT; }; log_location = "${devnet-root-directory}/osmosis.log"; availability = { restart = chain-restart; }; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index 931ff28fa8..dcc2b954e4 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -172,7 +172,9 @@ }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${self'.packages.cw20_base}" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + "$BINARY" tx wasm store ${ + self.inputs.cosmos.packages.${system}.cw20-base + }/lib/cw20_base.wasm --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS "$BINARY" tx wasm store "${ From 7b3408b02106b7d5f622fc8868d3cae46f7dd76e Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 21:06:12 +0000 Subject: [PATCH 15/23] neutron reg --- flake/cvm.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/flake/cvm.json b/flake/cvm.json index 3c3995f1ea..f7ac90223c 100644 --- a/flake/cvm.json +++ b/flake/cvm.json @@ -1,6 +1,34 @@ { "config": { "force": [ + { + "force_network": { + "network_id": 4, + "accounts": { + "bech": "neutron" + }, + "gateway": { + "cosm_wasm": { + "contract": "$NEUTRON_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $NEUTRON_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true + } + } + } + } + } + } + }, { "force_network": { "network_id": 3, From 3b0aa5040ce96f5bfff5688355e5e10cf0b237e7 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Thu, 7 Dec 2023 23:19:46 +0000 Subject: [PATCH 16/23] clean --- flake.nix | 11 - flake/cvm.json | 404 +++++++++--------- flake/dev-shells.nix | 3 - .../composable-cosmos/flake-module.nix | 6 - 4 files changed, 207 insertions(+), 217 deletions(-) diff --git a/flake.nix b/flake.nix index f7a1902363..769afbf073 100644 --- a/flake.nix +++ b/flake.nix @@ -82,17 +82,6 @@ networks = { url = "github:ComposableFi/networks"; }; - instrumental = { - url = - "github:InstrumentalFi/instrumental-contracts/61b3c81992178b7382308bfc3ecce04fff3de59c"; - inputs.cosmos.follows = "cosmos"; - inputs.crane.follows = "crane"; - inputs.flake-parts.follows = "flake-parts"; - inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; - eth-pos-devnet-src = { flake = false; url = "github:OffchainLabs/eth-pos-devnet"; diff --git a/flake/cvm.json b/flake/cvm.json index f7ac90223c..bbb1bf3442 100644 --- a/flake/cvm.json +++ b/flake/cvm.json @@ -1,231 +1,241 @@ { - "config": { - "force": [ - { - "force_network": { - "network_id": 4, - "accounts": { - "bech": "neutron" - }, - "gateway": { - "cosm_wasm": { - "contract": "$NEUTRON_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $NEUTRON_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } + "config": { + "force": [ + { + "force_network": { + "network_id": 4, + "accounts": { + "bech": "neutron" + }, + "gateway": { + "cosm_wasm": { + "contract": "$NEUTRON_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $NEUTRON_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true } } } } } - }, - { - "force_network": { - "network_id": 3, - "accounts": { - "bech": "osmo" - }, - "gateway": { - "cosm_wasm": { - "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } + } + }, + { + "force_network": { + "network_id": 3, + "accounts": { + "bech": "osmo" + }, + "gateway": { + "cosm_wasm": { + "contract": "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $OSMOSIS_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true } } } } } - }, - { - "force_network": { - "network_id": 2, - "accounts": { - "bech": "centauri" - }, - "gateway": { - "cosm_wasm": { - "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", - "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, - "admin": "$KEY" - } - }, - "ibc": { - "channels": { - "ics20": { - "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", - "features": { - "pfm": {}, - "wasm_hooks": { - "callback": true - } + } + }, + { + "force_network": { + "network_id": 2, + "accounts": { + "bech": "centauri" + }, + "gateway": { + "cosm_wasm": { + "contract": "$CENTAURI_GATEWAY_CONTRACT_ADDRESS", + "interpreter_code_id": $CENTAURI_INTERPRETER_CODE_ID, + "admin": "$KEY" + } + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {}, + "wasm_hooks": { + "callback": true } } } } } - }, - { - "force_network_to_network": { - "from": 2, - "to": 3, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } + } + }, + { + "force_network_to_network": { + "from": 2, + "to": 3, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" } } - }, - { - "force_network_to_network": { - "from": 3, - "to": 2, - "other": { - "counterparty_timeout": { - "seconds": 600 - }, - "ics_20": { - "source": "channel-0", - "sink": "channel-0" - } + } + }, + { + "force_network_to_network": { + "from": 3, + "to": 2, + "other": { + "counterparty_timeout": { + "seconds": 600 + }, + "ics_20": { + "source": "channel-0", + "sink": "channel-0" } } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851009", - "network_id": 3, - "local": { - "native": { - "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "ppica", - "trace_path": "transfer/channel-0" - } - } + } + }, + { + "force_asset": { + "asset_id": "316912650057057350374175801345", + "network_id": 4, + "metadata": "Native asset of Cosmos Neutron", + "local": { + "native": { + "denom": "untrn" } } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900673", - "network_id": 2, - "local": { - "native": { - "denom": "ppica" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "1", - "trace_path": "transfer/channel-1" - } + } + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851009", + "network_id": 3, + "local": { + "native": { + "denom": "ibc/3262D378E1636BE287EC355990D229DCEB828F0C60ED5049729575E235C60E8B" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "ppica", + "trace_path": "transfer/channel-0" } } } - }, - { - "force_asset": { - "asset_id": "158456325028528675187087900674", - "network_id": 2, - "local": { - "native": { - "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "bridged": { - "location_on_network": { - "ibc_ics20": { - "base_denom": "uosmo", - "trace_path": "transfer/channel-0" - } + } + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900673", + "network_id": 2, + "local": { + "native": { + "denom": "ppica" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "1", + "trace_path": "transfer/channel-1" } } } - }, - { - "force_asset": { - "asset_id": "237684487542793012780631851010", - "network_id": 3, - "local": { - "native": { - "denom": "uosmo" + } + }, + { + "force_asset": { + "asset_id": "158456325028528675187087900674", + "network_id": 2, + "local": { + "native": { + "denom": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "bridged": { + "location_on_network": { + "ibc_ics20": { + "base_denom": "uosmo", + "trace_path": "transfer/channel-0" } } } - }, - { - "force_exchange": { - "exchange": { - "osmosis_cross_chain_swap" : - { - "pool_id": 1, - "token_a": "uosmo", - "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" - } - }, - "exchange_id": "237684489387467420151587012609", - "network_id": 3 - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900673", - "other_network": 3, - "other_asset": "237684487542793012780631851009" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851009", - "other_network": 2, - "other_asset": "158456325028528675187087900673" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "158456325028528675187087900674", - "other_network": 3, - "other_asset": "237684487542793012780631851010" - } - }, - { - "force_asset_to_network_map": { - "this_asset": "237684487542793012780631851010", - "other_network": 2, - "other_asset": "158456325028528675187087900674" + } + }, + { + "force_asset": { + "asset_id": "237684487542793012780631851010", + "network_id": 3, + "local": { + "native": { + "denom": "uosmo" + } } } - ] - } + }, + { + "force_exchange": { + "exchange": { + "osmosis_cross_chain_swap": { + "pool_id": 1, + "token_a": "uosmo", + "token_b": "ibc/ED07A3391A112B175915CD8FAF43A2DA8E4790EDE12566649D0C2F97716B8518" + } + }, + "exchange_id": "237684489387467420151587012609", + "network_id": 3 + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900673", + "other_network": 3, + "other_asset": "237684487542793012780631851009" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851009", + "other_network": 2, + "other_asset": "158456325028528675187087900673" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "158456325028528675187087900674", + "other_network": 3, + "other_asset": "237684487542793012780631851010" + } + }, + { + "force_asset_to_network_map": { + "this_asset": "237684487542793012780631851010", + "other_network": 2, + "other_asset": "158456325028528675187087900674" + } + } + ] } - \ No newline at end of file +} \ No newline at end of file diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix index 43d9f349d9..db3ce8dd9f 100644 --- a/flake/dev-shells.nix +++ b/flake/dev-shells.nix @@ -175,9 +175,6 @@ GATEWAY_WASM_FILE = "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway }/lib/cw_cvm_gateway.wasm"; - STAKING_WASM_FILE = "${ - self.inputs.instrumental.packages."${system}".staking - }/lib/staking.wasm"; ORDER_WASM_FILE = "${ self.inputs.cvm.packages."${system}".cw-mantis-order }/lib/cw_mantis_order.wasm"; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index dcc2b954e4..8ca4b0ff1b 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -182,12 +182,6 @@ }/lib/cw_mantis_order.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" ORDER_CODE_ID=4 - sleep $BLOCK_SECONDS - "$BINARY" tx wasm store "${ - self.inputs.instrumental.packages."${system}".staking - }/lib/staking.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - # INSTRUMENTAL_STAKING_CODE_ID=5 - sleep $BLOCK_SECONDS "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE From ee88a838f4b76e72d16d5e62a912912fc98a2a80 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 11:37:12 +0000 Subject: [PATCH 17/23] lock update --- flake.lock | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/flake.lock b/flake.lock index d5499119ff..178b22e73c 100644 --- a/flake.lock +++ b/flake.lock @@ -2218,42 +2218,6 @@ "type": "github" } }, - "instrumental": { - "inputs": { - "cosmos": [ - "cosmos" - ], - "crane": [ - "crane" - ], - "flake-parts": [ - "flake-parts" - ], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1699737818, - "narHash": "sha256-J6Jjcg1FNHgSV19E1rct590jbGdNETsuNYV7UPbbkJQ=", - "owner": "InstrumentalFi", - "repo": "instrumental-contracts", - "rev": "61b3c81992178b7382308bfc3ecce04fff3de59c", - "type": "github" - }, - "original": { - "owner": "InstrumentalFi", - "repo": "instrumental-contracts", - "rev": "61b3c81992178b7382308bfc3ecce04fff3de59c", - "type": "github" - } - }, "interchain-security-src": { "flake": false, "locked": { @@ -3300,7 +3264,6 @@ "flake-utils": "flake-utils_6", "helix": "helix", "home-manager": "home-manager", - "instrumental": "instrumental", "networks": "networks", "neutron-src": "neutron-src_3", "nix-std": "nix-std_3", From d07d7c94cd20361f8b53dbfe035b5f1a767152e9 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 11:41:56 +0000 Subject: [PATCH 18/23] osmo config --- flake/cosmos/osmosis.nix | 9 ++++++--- flake/cvm.json | 18 ++++++++++++++++++ flake/devnets/cosmos.nix | 2 +- flake/lightnet.nix | 1 - 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index 7c45e18080..ba315e90b4 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -122,7 +122,7 @@ add-genesis-account "$VALIDATOR_MNEMONIC" "$VALIDATOR_MONIKER" add-genesis-account "$FAUCET_MNEMONIC" "faucet" add-genesis-account "$RLY_MNEMONIC_3" "relayer" - add-genesis-account "${cosmosTools.cvm.mnemonic}" "cvm" + add-genesis-account "$APP_1" "cvm" add-genesis-account "${cosmosTools.pools.mnemonic}" "pools" osmosisd gentx $VALIDATOR_MONIKER 500000000uosmo --keyring-backend=test --chain-id=$CHAIN_ID --home "$CHAIN_DATA" @@ -236,8 +236,8 @@ ''; }; - osmosisd-cvm-config = pkgs.writeShellApplication { - name = "osmosisd-cvm-config"; + osmosis-cvm-config = pkgs.writeShellApplication { + name = "osmosis-cvm-config"; runtimeInputs = devnetTools.withBaseContainerTools ++ [ osmosisd pkgs.jq pkgs.dasel ]; text = '' @@ -248,6 +248,9 @@ CENTAURI_INTERPRETER_CODE_ID=$(cat $HOME/.centaurid/interpreter_code_id) OSMOSIS_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.osmosisd/gateway_contract_address") OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") + NEUTRON_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.neutrond/gateway_contract_address") + NEUTRON_INTERPRETER_CODE_ID=$(cat "$HOME/.neutrond/interpreter_code_id") + FORCE_CONFIG=$(cat << EOF ${builtins.readFile ../cvm.json} diff --git a/flake/cvm.json b/flake/cvm.json index bbb1bf3442..bcbfc10c04 100644 --- a/flake/cvm.json +++ b/flake/cvm.json @@ -1,6 +1,24 @@ { "config": { "force": [ + { + "force_network": { + "network_id": 5, + "accounts": { + "bech": "cosmos" + }, + "ibc": { + "channels": { + "ics20": { + "sender": "CosmosStargateIbcApplicationsTransferV1MsgTransfer", + "features": { + "pfm": {} + } + } + } + } + } + }, { "force_network": { "network_id": 4, diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index 2ab7c6a104..a4396080eb 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -147,7 +147,7 @@ in { } // depends-on-cvm-init; osmosis-cvm-config = { - command = self'.packages.osmosisd-cvm-config; + command = self'.packages.osmosis-cvm-config; log_location = "${devnet-root-directory}/osmosis-cvm-config.log"; availability = { restart = chain-restart; }; } // depends-on-cvm-init; diff --git a/flake/lightnet.nix b/flake/lightnet.nix index f16e2a80d7..25d46a52b7 100644 --- a/flake/lightnet.nix +++ b/flake/lightnet.nix @@ -1,6 +1,5 @@ { self, ... }: { perSystem = { config, self', inputs', pkgs, ... }: - { packages = { lightnet-picasso = pkgs.writeShellApplication { From a6986935b0490f8e5880e78beec6fcf30a8b1b3c Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 12:07:26 +0000 Subject: [PATCH 19/23] fixed --- flake.nix | 1 - flake/ci.md | 91 --------------------------------- flake/cosmos/osmosis.nix | 14 +++-- flake/darwin-configurations.nix | 60 ---------------------- flake/devnet.dot | 29 ----------- flake/devnets/cosmos.nix | 9 +--- flake/lightnet.nix | 19 ++++--- 7 files changed, 17 insertions(+), 206 deletions(-) delete mode 100644 flake/ci.md delete mode 100644 flake/darwin-configurations.nix delete mode 100644 flake/devnet.dot diff --git a/flake.nix b/flake.nix index 769afbf073..ce76ac8d84 100644 --- a/flake.nix +++ b/flake.nix @@ -134,7 +134,6 @@ ./flake/check.nix ./flake/lightnet.nix ./flake/cosmos.nix - ./flake/darwin-configurations.nix ./flake/dev-shells.nix ./flake/devnet-tools.nix ./flake/devnet.nix diff --git a/flake/ci.md b/flake/ci.md deleted file mode 100644 index 1180033c0c..0000000000 --- a/flake/ci.md +++ /dev/null @@ -1,91 +0,0 @@ -## How to setup new dedicated machine - -## Image - -```bash -installimage -i images/Ubuntu-2204-jammy-amd64-base.tar.gz -G yes -a -n hetzner-ax161-{N}` -``` - -## Sudo - -```bash -set -o errexit -adduser actions-runner --disabled-password && passwd --delete actions-runner -sh <(curl -L https://nixos.org/nix/install) --daemon --yes && source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh -cat > /etc/nix/nix.conf << EOF - accept-flake-config = false - allow-import-from-derivation = true - allowed-users = root actions-runner - auto-optimise-store = true - connect-timeout = 30 - cores = 64 - download-attempts = 5 - experimental-features = nix-command flakes cgroups - gc-reserved-space = 100000000000 - http-connections = 32 - http2 = true - keep-derivations = true - keep-failed = false - keep-outputs = true - max-free = 1000000000000 - max-jobs = 1 - min-free = 200000000000 - narinfo-cache-negative-ttl = 0 - require-sigs = true - sandbox = relaxed - sandbox-fallback = false - stalled-download-timeout = 300 - substitute = true - substituters = https://nix-community.cachix.org/ https://cache.nixos.org/ https://composable.cachix.org/ https://devenv.cachix.org/ https://cosmos.cachix.org https://nixpkgs-update.cachix.org - system-features = kvm - timeout = 3600 - trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= cosmos.cachix.org-1:T5U9yg6u2kM48qAOXHO/ayhO8IWFnv0LOhNcq0yKuR8= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= composable.cachix.org-1:J2TVJKH4U8xqYdN/0SpauoAxLuDYeheJtv22Vn3Hav8= nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8= devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw= - trusted-substituters = https://nix-community.cachix.org/ https://cache.nixos.org/ https://composable.cachix.org/ https://devenv.cachix.org/ https://cosmos.cachix.org https://nixpkgs-update.cachix.org - trusted-users = root actions-runner - use-cgroups = true - warn-dirty = true -EOF -service nix-daemon restart -apt-get update && apt-get install apt-transport-https qemu-system-x86 ca-certificates curl gnupg software-properties-common --yes -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null -apt update && apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin cron --yes -usermod --append --groups docker actions-runner && service docker restart -usermod --append --groups kvm actions-runner && chmod 666 /dev/kvm -echo "0 5 * * 1 nix-store --gc && nix-store --optimise" > /var/spool/cron/crontabs/actions-runner -systemctl enable cron -service nix-daemon restart && service docker restart && service cron restart -mkdir --parents /home/actions-runner/ -cd /home/actions-runner/ -su actions-runner -``` - -## User - -```bash -nix profile install "nixpkgs#git" "nixpkgs#git-lfs" "nixpkgs#cachix" "nixpkgs#process-compose" "nixpkgs#dasel" "nixpkgs#nix-tree" "nixpkgs#hx" "nixpkgs#lazygit" -``` - -### x84_64 - -```bash -curl -o actions-runner-linux-x64-2.307.1.tar.gz -L https://github.com/actions/runner/releases/download/v2.307.1/actions-runner-linux-x64-2.307.1.tar.gz -tar xzf ./actions-runner-linux-x64-2.307.1.tar.gz - -./config.sh --url https://github.com/ComposableFi/composable --token $TOKEN --name hetzner-ax161-$MACHINE_ID --labels x86_64-linux-32C-128GB-2TB --work _work -``` - -### aarch64 - -```bash -curl -o actions-runner-linux-arm64-2.307.1.tar.gz -L https://github.com/actions/runner/releases/download/v2.307.1/actions-runner-linux-arm64-2.307.1.tar.gz -tar xzf ./actions-runner-linux-arm64-2.307.1.tar.gz - -./config.sh --url https://github.com/ComposableFi/composable --token $TOKEN --name hetzner-rx170-$MACHINE_ID --labels aarch64-linux-80C-128GB-2048GB --work _work -``` - -## Sudo again - -```bash -./svc.sh install actions-runner && ./svc.sh start && systemctl daemon-reload -``` \ No newline at end of file diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index ba315e90b4..919c264d89 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -5,7 +5,7 @@ devnet-root-directory = cosmosTools.devnet-root-directory; validator-key = cosmosTools.validators.osmosis; devnet = pkgs.networksLib.osmosis.devnet; - + log = " --log_level trace --trace "; in { packages = rec { @@ -155,8 +155,7 @@ dasel put --type string --file $CONFIG_FOLDER/client.toml --value "tcp://localhost:$CONSENSUS_RPC_PORT" '.node' - - osmosisd start --home "$CHAIN_DATA" --rpc.unsafe --pruning=nothing --p2p.pex false --p2p.upnp false --p2p.seed_mode true --log_level trace --trace + osmosisd start --home "$CHAIN_DATA" --rpc.unsafe --pruning=nothing --p2p.pex false --p2p.upnp false --p2p.seed_mode true ${log} ''; }; @@ -231,13 +230,13 @@ "$BINARY" tx gamm create-pool --pool-file=${ ./osmosis-gamm-pool-pica-osmo.json - } --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from pools --keyring-dir "$KEYRING_TEST" --trace --log_level trace --broadcast-mode block + } --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --keyring-backend test --home "$CHAIN_DATA" --from pools --keyring-dir "$KEYRING_TEST" ${log} --broadcast-mode block "$BINARY" query gamm pools --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" ''; }; - osmosis-cvm-config = pkgs.writeShellApplication { - name = "osmosis-cvm-config"; + osmosisd-cvm-config = pkgs.writeShellApplication { + name = "osmosisd-cvm-config"; runtimeInputs = devnetTools.withBaseContainerTools ++ [ osmosisd pkgs.jq pkgs.dasel ]; text = '' @@ -250,13 +249,12 @@ OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") NEUTRON_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.neutrond/gateway_contract_address") NEUTRON_INTERPRETER_CODE_ID=$(cat "$HOME/.neutrond/interpreter_code_id") - FORCE_CONFIG=$(cat << EOF ${builtins.readFile ../cvm.json} EOF ) - "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" ${log} sleep "$BLOCK_SECONDS" diff --git a/flake/darwin-configurations.nix b/flake/darwin-configurations.nix deleted file mode 100644 index ace62cf580..0000000000 --- a/flake/darwin-configurations.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ self, withSystem, inputs, lib, options, flake-parts-lib, specialArgs, config -}: { - flake = { - darwinConfigurations = let - - user = "administrator"; - in { - default = self.inputs.darwin.lib.darwinSystem { - system = "aarch64-darwin"; - modules = [ - ({ config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - helix - github-runner - git - git-lfs - docker - nix - cachix - ]; - - services = { nix-daemon.enable = true; }; - launchd.daemons.github-runner = { - serviceConfig = { - ProgramArguments = [ - "/bin/sh" - "-c" - # follow exact steps of github guide to get this available - # so more automatic nix version would use pkgs.github-runner (and token sshed as file) - "/Users/${user}/actions-runner/run.sh" - ]; - Label = "github-runner"; - KeepAlive = true; - RunAtLoad = true; - - StandardErrorPath = "/Users/${user}/actions-runner/err.log"; - StandardOutPath = "/Users/${user}/actions-runner/ok.log"; - WorkingDirectory = "/Users/${user}/actions-runner/"; - SessionCreate = true; - UserName = "${user}"; - - }; - }; - - nix.package = pkgs.nix; - programs.bash.enable = true; - system.stateVersion = 4; - } - - ) - ]; - inputs = { - darwin = self.inputs.darwin; - nixpkgs = self.inputs.nixpkgs; - }; - }; - }; - }; -} - diff --git a/flake/devnet.dot b/flake/devnet.dot deleted file mode 100644 index 103c6620d0..0000000000 --- a/flake/devnet.dot +++ /dev/null @@ -1,29 +0,0 @@ -digraph devnet { - graph [fontname = "Handlee"]; - node [fontname = "Handlee"]; - edge [fontname = "Handlee"]; - Picasso [shape = box3d; label = "Picasso B";]; - Rococo [shape = box3d;]; - Osmosis [shape = box3d;]; - sibling [shape = box3d;label = "Picasso A";]; - Postgres [shape = cylinder;]; - Redis [shape = cylinder;]; - Picasso_frontend [shape = octagon;label = "Picasso Frontend";]; - ibc-relayer [shape = rectangle;label = "ibc-relayer";]; - Picasso -> Rococo; - Rococo -> Picasso; - Rococo -> sibling; - sibling -> Rococo; - ibc-relayer -> Picasso [label = "syncronize"; arrowhead = tee;]; - ibc-relayer -> sibling [label = "syncronize"; arrowhead = tee;]; - ibc-relayer -> Rococo [label = "finality proofs"; arrowhead = tee;]; - - ibc_test [shape = hexagon;label = "ibc-rs-test";]; - - ibc_test -> Picasso [label = "configure"; style = dotted;]; - ibc_test -> sibling [label = "configure"; style = dotted;]; - zombienet -> Picasso [label = "configure"; style = dotted;]; - zombienet [shape = hexagon;label = "zombienet";]; - zombienet -> sibling [label = "configure"; style = dotted;]; - zombienet -> Rococo [label = "configure"; style = dotted;]; -} \ No newline at end of file diff --git a/flake/devnets/cosmos.nix b/flake/devnets/cosmos.nix index a4396080eb..6141b8c69f 100644 --- a/flake/devnets/cosmos.nix +++ b/flake/devnets/cosmos.nix @@ -4,8 +4,7 @@ let depends-on-cvm-init = { depends_on."centauri-cvm-init".condition = "process_completed_successfully"; depends_on."osmosis-cvm-init".condition = "process_completed_successfully"; - depends_on."neutron-cvm-init".condition = "process_completed_successfully"; - + depends_on."neutron-init".condition = "process_completed_successfully"; }; in { settings = { @@ -138,16 +137,12 @@ in { centauri-cvm-config = { command = self'.packages.centaurid-cvm-config; - depends_on."centauri-cvm-init".condition = - "process_completed_successfully"; - depends_on."osmosis-cvm-init".condition = - "process_completed_successfully"; log_location = "${devnet-root-directory}/centauri-cvm-config.log"; availability = { restart = chain-restart; }; } // depends-on-cvm-init; osmosis-cvm-config = { - command = self'.packages.osmosis-cvm-config; + command = self'.packages.osmosisd-cvm-config; log_location = "${devnet-root-directory}/osmosis-cvm-config.log"; availability = { restart = chain-restart; }; } // depends-on-cvm-init; diff --git a/flake/lightnet.nix b/flake/lightnet.nix index 25d46a52b7..e248d9f062 100644 --- a/flake/lightnet.nix +++ b/flake/lightnet.nix @@ -1,14 +1,13 @@ { self, ... }: { - perSystem = { config, self', inputs', pkgs, ... }: - { - packages = { - lightnet-picasso = pkgs.writeShellApplication { - name = "lightnet-picasso"; - runtimeInputs = [ pkgs.nodejs ]; - text = '' - npx @acala-network/chopsticks@latest xcm -r kusama -p picasso-kusama -p statemine - ''; - }; + perSystem = { config, self', inputs', pkgs, ... }: { + packages = { + lightnet-picasso = pkgs.writeShellApplication { + name = "lightnet-picasso"; + runtimeInputs = [ pkgs.nodejs ]; + text = '' + npx @acala-network/chopsticks@latest xcm -r kusama -p picasso-kusama -p statemine + ''; }; }; + }; } From 221eb28429e8451a251e310ecbfc59d072f74a47 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 12:12:54 +0000 Subject: [PATCH 20/23] clean --- flake/fmt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/fmt.nix b/flake/fmt.nix index 1a96bef644..94c18b47e2 100644 --- a/flake/fmt.nix +++ b/flake/fmt.nix @@ -80,7 +80,7 @@ deadnix --version SRC=$(find ${allNixFiles} -name "*.nix" -type f | tr "\n" " ") echo $SRC - deadnix $SRC + deadnix $SRC --no-lambda-arg --no-lambda-pattern-names --no-underscore ''; }; From 09292f966114a9142f91284aa405448423ca4197 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 12:16:29 +0000 Subject: [PATCH 21/23] deadnix --- code/composable-nodes.nix | 2 -- flake/cosmos/cosmos-hub.nix | 4 +--- flake/cosmos/hermes.nix | 1 - flake/cosmos/neutron.nix | 5 +---- flake/cosmos/osmosis.nix | 1 - flake/devnets/flake-module.nix | 1 - flake/fmt.nix | 10 ---------- flake/ibc.nix | 1 - flake/mantis.nix | 4 +--- flake/xapps.nix | 4 +--- flake/zombienet.nix | 14 -------------- .../ComposableFi/composable-ibc/flake-module.nix | 5 ----- inputs/paritytech/polkadot.nix | 5 ----- inputs/paritytech/zombienet/flake-module.nix | 4 +--- 14 files changed, 5 insertions(+), 56 deletions(-) diff --git a/code/composable-nodes.nix b/code/composable-nodes.nix index 3f4db83ea6..22ccd845a8 100644 --- a/code/composable-nodes.nix +++ b/code/composable-nodes.nix @@ -3,8 +3,6 @@ , subnix, devnetTools, cargoTools, ... }: let - - rustSrc = cargoTools.mkRustSrc ./.; toDockerImage = { ... }@drv: (pkgs.dockerTools.buildImage { name = drv.name or drv.pname or "image"; diff --git a/flake/cosmos/cosmos-hub.nix b/flake/cosmos/cosmos-hub.nix index 7701f84387..d279bc48e0 100644 --- a/flake/cosmos/cosmos-hub.nix +++ b/flake/cosmos/cosmos-hub.nix @@ -1,9 +1,7 @@ { self, ... }: { perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools , cosmosTools, bashTools, ... }: - let - devnet-root-directory = cosmosTools.devnet-root-directory; - devnet = pkgs.networksLib.cosmos-hub.devnet; + let devnet = pkgs.networksLib.cosmos-hub.devnet; in { packages = rec { diff --git a/flake/cosmos/hermes.nix b/flake/cosmos/hermes.nix index d710231db9..025abf620f 100644 --- a/flake/cosmos/hermes.nix +++ b/flake/cosmos/hermes.nix @@ -8,7 +8,6 @@ cosmwasm-check = self.input.cosmos.packages.${system}.cosmwasm-check; }; devnet-root-directory = "/tmp/composable-devnet"; - validator-key = "osmo12smx2wdlyttvyzvzg54y2vnqwq2qjateuf7thj"; log = "trace"; hermes-config = (cosmos.evalHermesModule { modules = [{ diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 9f2df659f8..947acf235a 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -1,10 +1,7 @@ { self, inputs, ... }: { perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools , cosmosTools, bashTools, ... }: - let - devnet-root-directory = cosmosTools.devnet-root-directory; - validator-key = cosmosTools.validators.neutron; - devnetConfig = pkgs.networksLib.neutron.devnet; + let devnetConfig = pkgs.networksLib.neutron.devnet; in { packages = rec { diff --git a/flake/cosmos/osmosis.nix b/flake/cosmos/osmosis.nix index 919c264d89..e2527cf87e 100644 --- a/flake/cosmos/osmosis.nix +++ b/flake/cosmos/osmosis.nix @@ -3,7 +3,6 @@ , cosmosTools, bashTools, ... }: let devnet-root-directory = cosmosTools.devnet-root-directory; - validator-key = cosmosTools.validators.osmosis; devnet = pkgs.networksLib.osmosis.devnet; log = " --log_level trace --trace "; in { diff --git a/flake/devnets/flake-module.nix b/flake/devnets/flake-module.nix index 39d7ca7d78..cc31749d56 100644 --- a/flake/devnets/flake-module.nix +++ b/flake/devnets/flake-module.nix @@ -4,7 +4,6 @@ let networks = pkgs.networksLib; devnet-root-directory = "/tmp/composable-devnet"; - validator-key = "osmo12smx2wdlyttvyzvzg54y2vnqwq2qjateuf7thj"; relay = "no"; # `no` not to restart, `on_failure` for chain-restart = "no"; # `no` not to restart, `on_failure` for parachain-startup = { diff --git a/flake/fmt.nix b/flake/fmt.nix index 94c18b47e2..3391ee8e71 100644 --- a/flake/fmt.nix +++ b/flake/fmt.nix @@ -1,16 +1,6 @@ { self, ... }: { perSystem = { config, self', inputs', pkgs, system, ... }: let - allDirectoriesAndFiles = pkgs.stdenv.mkDerivation { - name = "allDirectoriesAndFiles"; - src = - builtins.filterSource (path: _type: baseNameOf path != ".git") ./.; - dontUnpack = true; - installPhase = '' - mkdir $out/ - cp -r $src/. $out/ - ''; - }; filesWithExtension = extension: pkgs.stdenv.mkDerivation { diff --git a/flake/ibc.nix b/flake/ibc.nix index 83b5c189cf..8260ad77a2 100644 --- a/flake/ibc.nix +++ b/flake/ibc.nix @@ -3,7 +3,6 @@ { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools, ... }: let devnet-root-directory = "/tmp/composable-devnet"; - validator-key = "osmo12smx2wdlyttvyzvzg54y2vnqwq2qjateuf7thj"; RUST_LOG = "info,hyperspace=info,hyperspace_parachain=debug,hyperspace_cosmos=debug"; in { diff --git a/flake/mantis.nix b/flake/mantis.nix index 10f253fe3a..c08c5f89e1 100644 --- a/flake/mantis.nix +++ b/flake/mantis.nix @@ -1,8 +1,6 @@ { self, ... }: { perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools - , cosmosTools, ... }: - let log = "debug"; - in { + , cosmosTools, ... }: { packages = rec { mantis-simulate-solve = pkgs.writeShellApplication { runtimeInputs = devnetTools.withBaseContainerTools diff --git a/flake/xapps.nix b/flake/xapps.nix index 637a52488d..c5f4047fcf 100644 --- a/flake/xapps.nix +++ b/flake/xapps.nix @@ -2,9 +2,7 @@ { self, ... }: { perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools , cosmosTools, bashTools, osmosis, centauri, ... }: - let - devnet-root-directory = cosmosTools.devnet-root-directory; - validator-key = cosmosTools.validators.osmosis; + let devnet-root-directory = cosmosTools.devnet-root-directory; in { packages = rec { xc-transfer-osmo-from--osmosis-to-centauri = diff --git a/flake/zombienet.nix b/flake/zombienet.nix index 5a254e3319..a692e5ed21 100644 --- a/flake/zombienet.nix +++ b/flake/zombienet.nix @@ -80,20 +80,6 @@ }; }; - mk-zombienet-all = name: chain: - with prelude; - let - config = mkZombienet { - relaychain = relaychainBase; - parachains = [{ - command = pkgs.lib.meta.getExe self'.packages.composable-node; - inherit chain; - id = 2087; - collators = 3; - }]; - }; - in zombieTools.writeZombienetShellApplication name config; - picasso-dev-config = overrideZombienet { chain = "picasso-dev"; command = self'.packages.composable-testfast-node; diff --git a/inputs/ComposableFi/composable-ibc/flake-module.nix b/inputs/ComposableFi/composable-ibc/flake-module.nix index 87df21ec7b..7341e043d0 100644 --- a/inputs/ComposableFi/composable-ibc/flake-module.nix +++ b/inputs/ComposableFi/composable-ibc/flake-module.nix @@ -2,11 +2,6 @@ perSystem = { config, self', inputs', pkgs, system, crane, subnix , systemCommonRust, ... }: let - cargo-lock = builtins.fromTOML (builtins.readFile ../../code/Cargo.lock); - centauri-runtime-dep = builtins.head - (builtins.filter (x: x.name == "pallet-ibc") (cargo-lock.package)); - centauri-runtime-commit = - builtins.elemAt (builtins.split "#" centauri-runtime-dep.source) 2; host = "127.0.0.1"; hyperspace-picasso-kusama-config-base = { channel_whitelist = [ ]; diff --git a/inputs/paritytech/polkadot.nix b/inputs/paritytech/polkadot.nix index 262a403a5a..10ddc26d09 100644 --- a/inputs/paritytech/polkadot.nix +++ b/inputs/paritytech/polkadot.nix @@ -23,11 +23,6 @@ systemCommonRust.common-attrs.nativeBuildInputs; meta = { mainProgram = "polkadot"; }; }); - cargo-lock = builtins.fromTOML (builtins.readFile ../../code/Cargo.lock); - rococo-runtime-dep = builtins.head - (builtins.filter (x: x.name == "rococo-runtime") (cargo-lock.package)); - rococo-runtime-commit = - builtins.elemAt (builtins.split "#" rococo-runtime-dep.source) 2; mkRelayRuntime = url: hash: pkgs.stdenv.mkDerivation { diff --git a/inputs/paritytech/zombienet/flake-module.nix b/inputs/paritytech/zombienet/flake-module.nix index fa31363ad7..c1118c7b10 100644 --- a/inputs/paritytech/zombienet/flake-module.nix +++ b/inputs/paritytech/zombienet/flake-module.nix @@ -14,9 +14,7 @@ inherit name; runtimeInputs = with pkgs; [ nodejs zombienet.default ] ++ runtimeDeps; - text = let - dir-parameter = if dir != null then "--dir ${dir}" else ""; - dir-command = if dir != null then "mkdir --parents ${dir}" else ""; + text = let dir-parameter = if dir != null then "--dir ${dir}" else ""; in '' ACTIONS_RUNNER_DEBUG=''${ACTIONS_RUNNER_DEBUG:-false} LEVEL=''${1:-error} From 031f4d349e28a42bf5b2e25ec41bbef79d52b896 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 12:49:56 +0000 Subject: [PATCH 22/23] happy --- flake/cosmos/neutron.nix | 29 ++++++++++++- .../composable-cosmos/flake-module.nix | 43 +++++++++++-------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 947acf235a..95186ea9f0 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -2,7 +2,7 @@ perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools , cosmosTools, bashTools, ... }: let devnetConfig = pkgs.networksLib.neutron.devnet; - + log = " --log_level trace --trace "; in { packages = rec { neutrond = pkgs.writeShellApplication { @@ -23,6 +23,33 @@ ''; }; + neutrond-cvm-config = pkgs.writeShellApplication { + name = "neutrond-cvm-config"; + runtimeInputs = devnetTools.withBaseContainerTools + ++ [ neutrond pkgs.jq pkgs.dasel ]; + text = '' + ${bashTools.export pkgs.networksLib.osmosis.devnet} + KEY=${cosmosTools.cvm.osmosis} + + CENTAURI_GATEWAY_CONTRACT_ADDRESS=$(cat $HOME/.centaurid/gateway_contract_address) + CENTAURI_INTERPRETER_CODE_ID=$(cat $HOME/.centaurid/interpreter_code_id) + OSMOSIS_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.osmosisd/gateway_contract_address") + OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") + NEUTRON_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.neutrond/gateway_contract_address") + NEUTRON_INTERPRETER_CODE_ID=$(cat "$HOME/.neutrond/interpreter_code_id") + + FORCE_CONFIG=$(cat << EOF + ${builtins.readFile ../cvm.json} + EOF + ) + "$BINARY" tx wasm execute "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" ${log} + + + sleep "$BLOCK_SECONDS" + "$BINARY" query wasm contract-state all "$OSMOSIS_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$CONSENSUS_RPC_PORT" --output json --home "$CHAIN_DATA" + ''; + }; + neutron-gen = pkgs.writeShellApplication { name = "neutron-gen"; runtimeInputs = devnetTools.withBaseContainerTools diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index 8ca4b0ff1b..33b28eb284 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -2,7 +2,9 @@ perSystem = { config, self', inputs', pkgs, lib, system, crane , systemCommonRust, subnix, devnetTools, cosmosTools, bashTools, centauri , ... }: + let + log = " --log_level trace --trace "; devnet-root-directory = cosmosTools.devnet-root-directory; validator-mnemonic = cosmosTools.validators.mnemonic; validator-key = cosmosTools.validators.centauri; @@ -126,13 +128,15 @@ CENTAURI_INTERPRETER_CODE_ID=$(cat $HOME/.centaurid/interpreter_code_id) OSMOSIS_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.osmosisd/gateway_contract_address") OSMOSIS_INTERPRETER_CODE_ID=$(cat "$HOME/.osmosisd/interpreter_code_id") + NEUTRON_GATEWAY_CONTRACT_ADDRESS=$(cat "$HOME/.neutrond/gateway_contract_address") + NEUTRON_INTERPRETER_CODE_ID=$(cat "$HOME/.neutrond/interpreter_code_id") FORCE_CONFIG=$(cat << EOF ${builtins.readFile ../../../flake/cvm.json} EOF ) - "$BINARY" tx wasm execute "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx wasm execute "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" "$FORCE_CONFIG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" ${log} --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" ${log} sleep $BLOCK_SECONDS "$BINARY" query wasm contract-state all "$CENTAURI_GATEWAY_CONTRACT_ADDRESS" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" ''; @@ -151,6 +155,7 @@ CHAIN_DATA="${devnet-root-directory}/.centaurid" ${bashTools.export pkgs.networksLib.pica.devnet} + KEYRING_TEST="$CHAIN_DATA/keyring-test" KEY=${cosmosTools.cvm.centauri} PORT=26657 @@ -163,39 +168,43 @@ local INSTANTIATE=$1 "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-gateway - }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_cvm_gateway.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" GATEWAY_CODE_ID=1 sleep $BLOCK_SECONDS "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-cvm-executor - }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" - + }/lib/cw_cvm_executor.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + INTERPRETER_CODE_ID=2 sleep $BLOCK_SECONDS "$BINARY" tx wasm store ${ self.inputs.cosmos.packages.${system}.cw20-base - }/lib/cw20_base.wasm --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw20_base.wasm --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" sleep $BLOCK_SECONDS "$BINARY" tx wasm store "${ self.inputs.cvm.packages."${system}".cw-mantis-order - }/lib/cw_mantis_order.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" + }/lib/cw_mantis_order.wasm" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" ORDER_CODE_ID=4 sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "1234" --label "xc-gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE - - sleep $BLOCK_SECONDS - "$BINARY" tx wasm instantiate2 $ORDER_CODE_ID "{}" "1234" --label "mantis-order" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE --log_level info --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + "$BINARY" tx wasm instantiate2 $GATEWAY_CODE_ID "$INSTANTIATE" "2121" --label "composable_cvm_gateway" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE sleep $BLOCK_SECONDS GATEWAY_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$GATEWAY_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$GATEWAY_CONTRACT_ADDRESS" > "$CHAIN_DATA/gateway_contract_address" + sleep $BLOCK_SECONDS + echo "{\"cvm_address\": \"$GATEWAY_CONTRACT_ADDRESS\"}" + "$BINARY" tx wasm instantiate2 $ORDER_CODE_ID "{\"cvm_address\": \"$GATEWAY_CONTRACT_ADDRESS\"}" "2121" --label "composable_mantis_order" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166$FEE ${log} --keyring-backend test --home "$CHAIN_DATA" --from "$KEY" --keyring-dir "$KEYRING_TEST" --admin "$KEY" --amount 1000000000000$FEE + + + echo "wait for next block" + sleep $BLOCK_SECONDS ORDER_CONTRACT_ADDRESS=$("$BINARY" query wasm list-contract-by-code "$ORDER_CODE_ID" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --home "$CHAIN_DATA" | dasel --read json '.contracts.[0]' --write yaml) echo "$ORDER_CONTRACT_ADDRESS" > "$CHAIN_DATA/ORDER_CONTRACT_ADDRESS" - echo "2" > "$CHAIN_DATA/interpreter_code_id" + echo "$INTERPRETER_CODE_ID" > "$CHAIN_DATA/interpreter_code_id" } INSTANTIATE=$(cat << EOF @@ -225,13 +234,13 @@ ORDER_CONTRACT_ADDRESS=$(cat "$CHAIN_DATA/ORDER_CONTRACT_ADDRESS") sleep $BLOCK_SECONDS - "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"order":{"msg":{"wants":{"denom":"ptest","amount":"10000"},"timeout":1000}}}' --output json --yes --gas 25000000 --fees "1000000000ppica" --amount 1234567890"$FEE" --log_level info --from cvm-admin --trace --log_level trace + "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"order":{"msg":{"wants":{"denom":"ptest","amount":"10000"},"timeout":1000}}}' --output json --yes --gas 25000000 --fees "1000000000ppica" --amount 1234567890"$FEE" ${log} --from cvm-admin ${log} sleep $BLOCK_SECONDS - "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"order":{"msg":{"wants":{"denom":"ppica","amount":"10000"},"timeout":1000}}}' --output json --yes --gas 25000000 --fees "1000000000ptest" --amount "1234567890ptest" --log_level info --from cvm-admin --trace --log_level trace + "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"order":{"msg":{"wants":{"denom":"ppica","amount":"10000"},"timeout":1000}}}' --output json --yes --gas 25000000 --fees "1000000000ptest" --amount "1234567890ptest" ${log} --from cvm-admin ${log} sleep $BLOCK_SECONDS - "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"solve":{"msg":{"routes" : [], "cows":[{"order_id":"2","cow_amount":"100000","given":"100000"},{"order_id":"3","cow_amount":"100000","given":"100000"}],"timeout":5}}}' --output json --yes --gas 25000000 --fees "1000000000ptest" --amount 1234567890"$FEE" --log_level info --from cvm-admin --trace --log_level trace + "$BINARY" tx wasm execute "$ORDER_CONTRACT_ADDRESS" '{"solve":{"msg":{"routes" : [], "cows":[{"order_id":"2","cow_amount":"100000","given":"100000"},{"order_id":"3","cow_amount":"100000","given":"100000"}],"timeout":5}}}' --output json --yes --gas 25000000 --fees "1000000000ptest" --amount 1234567890"$FEE" ${log} --from cvm-admin ${log} ''; }; @@ -347,7 +356,7 @@ else echo "WARNING: REUSING EXISTING DATA FOLDER" fi - centaurid start --rpc.unsafe --rpc.laddr tcp://0.0.0.0:26657 --pruning=nothing --minimum-gas-prices=0.001ppica --log_level debug --home "$CHAIN_DATA" --db_dir "$CHAIN_DATA/data" --trace --with-tendermint true --transport socket --trace-store $CHAIN_DATA/kvstore.log --grpc.address localhost:${ + centaurid start --rpc.unsafe --rpc.laddr tcp://0.0.0.0:26657 --pruning=nothing --minimum-gas-prices=0.001ppica --home "$CHAIN_DATA" --db_dir "$CHAIN_DATA/data" ${log} --with-tendermint true --transport socket --trace-store $CHAIN_DATA/kvstore.log --grpc.address localhost:${ builtins.toString pkgs.networksLib.pica.devnet.GRPCPORT } --grpc.enable true --grpc-web.enable false --api.enable true --cpu-profile $CHAIN_DATA/cpu-profile.log --p2p.pex false --p2p.upnp false ''; @@ -376,7 +385,7 @@ BINARY=centaurid GATEWAY_CONTRACT_ADDRESS=$(cat $CHAIN_DATA/gateway_contract_address) MSG=$1 - "$BINARY" tx wasm execute "$GATEWAY_CONTRACT_ADDRESS" "$MSG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level info --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx wasm execute "$GATEWAY_CONTRACT_ADDRESS" "$MSG" --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" ${log} --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" ${log} ''; }; centauri-tx = pkgs.writeShellApplication { @@ -391,7 +400,7 @@ PORT=26657 FEE=ppica BINARY=centaurid - "$BINARY" tx ibc-transfer transfer transfer channel-0 osmo1x99pkz8mk7msmptegg887wy46vrusl7kk0sudvaf2uh2k8qz7spsyy4mg8 9876543210ppica --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --log_level trace --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" --trace --log_level trace + "$BINARY" tx ibc-transfer transfer transfer channel-0 osmo1x99pkz8mk7msmptegg887wy46vrusl7kk0sudvaf2uh2k8qz7spsyy4mg8 9876543210ppica --chain-id="$CHAIN_ID" --node "tcp://localhost:$PORT" --output json --yes --gas 25000000 --fees 920000166"$FEE" --keyring-backend test --home "$CHAIN_DATA" --from ${cosmosTools.cvm.moniker} --keyring-dir "$KEYRING_TEST" ${log} ''; }; }; From aae45585d60d9274d9d4ca92dcd361046b30d757 Mon Sep 17 00:00:00 2001 From: dzmitry-lahoda Date: Fri, 8 Dec 2023 12:56:20 +0000 Subject: [PATCH 23/23] fmt --- flake/cosmos/neutron.nix | 5 +++-- inputs/ComposableFi/composable-cosmos/flake-module.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake/cosmos/neutron.nix b/flake/cosmos/neutron.nix index 95186ea9f0..7007086da2 100644 --- a/flake/cosmos/neutron.nix +++ b/flake/cosmos/neutron.nix @@ -1,7 +1,8 @@ { self, inputs, ... }: { perSystem = { self', pkgs, systemCommonRust, subnix, lib, system, devnetTools , cosmosTools, bashTools, ... }: - let devnetConfig = pkgs.networksLib.neutron.devnet; + let + devnetConfig = pkgs.networksLib.neutron.devnet; log = " --log_level trace --trace "; in { packages = rec { @@ -23,7 +24,7 @@ ''; }; - neutrond-cvm-config = pkgs.writeShellApplication { + neutrond-cvm-config = pkgs.writeShellApplication { name = "neutrond-cvm-config"; runtimeInputs = devnetTools.withBaseContainerTools ++ [ neutrond pkgs.jq pkgs.dasel ]; diff --git a/inputs/ComposableFi/composable-cosmos/flake-module.nix b/inputs/ComposableFi/composable-cosmos/flake-module.nix index 33b28eb284..98e1f2c4f6 100644 --- a/inputs/ComposableFi/composable-cosmos/flake-module.nix +++ b/inputs/ComposableFi/composable-cosmos/flake-module.nix @@ -2,9 +2,9 @@ perSystem = { config, self', inputs', pkgs, lib, system, crane , systemCommonRust, subnix, devnetTools, cosmosTools, bashTools, centauri , ... }: - + let - log = " --log_level trace --trace "; + log = " --log_level trace --trace "; devnet-root-directory = cosmosTools.devnet-root-directory; validator-mnemonic = cosmosTools.validators.mnemonic; validator-key = cosmosTools.validators.centauri;