Drop locator

.github/workflows/cache.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.runner_label }}
     strategy:
       matrix:
-        runner_label: ${{ fromJSON('["lionco-runner-5", "lionco-runner-6"]') }}
+        runner_label: ${{ fromJSON('["lionco-runner-1", "lionco-runner-2", "lionco-runner-3", "lionco-runner-4", "lionco-runner-5", "lionco-runner-6", "lionco-runner-7", "lionco-runner-8", "lionco-runner-9", "lionco-runner-10"]') }}
     steps:
       - name: Stop old containers
         run: docker ps -q | grep -q . && docker stop $(docker ps -q) -t0 || echo "No containers to stop"
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.runner_label }}
     strategy:
       matrix:
-        runner_label: ${{ fromJSON('["lionco-runner-5", "lionco-runner-6"]') }}
+        runner_label: ${{ fromJSON('["lionco-runner-1", "lionco-runner-2", "lionco-runner-3", "lionco-runner-4", "lionco-runner-5", "lionco-runner-6", "lionco-runner-7", "lionco-runner-8", "lionco-runner-9", "lionco-runner-10"]') }}
     steps:
       - name: Clean Workspace
         if: always()

.github/workflows/tests.yml

@@ -656,3 +656,48 @@ jobs:
           docker stop -t0 $(docker ps -a -q) || true
           docker container prune -f || true
           docker volume rm $(docker volume ls -q) || true
+  test-locator:
+    name: test:locator Integration Tests
+    needs:
+      - images-prepare
+      - artifacts-prepare
+    runs-on: self-hosted
+    steps:
+      - name: Upgrade docker compose to use v2
+        run: sudo curl -L
+          "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname
+          -s)-$(uname -m)" -o /usr/local/bin/docker-compose && sudo chmod +x
+          /usr/local/bin/docker-compose
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.12.2
+      - name: Install Yarn
+        run: npm install -g yarn
+      - name: Log in to Private Registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Clean volumes
+        run: docker volume prune -f
+      - name: Download images
+        run: |
+          cd integration_tests
+          yarn build-images
+      - name: Download artifacts
+        uses: actions/cache@v4
+        with:
+          path: artifacts
+          key: ${{ runner.os }}-${{ github.sha }}
+      - name: Run test test:locator
+        run: cd integration_tests && yarn && yarn test:locator
+      - name: Cleanup resources
+        if: always()
+        run: |
+          docker stop -t0 $(docker ps -a -q) || true
+          docker container prune -f || true
+          docker volume rm $(docker volume ls -q) || true

.gitignore

@@ -1,5 +1,8 @@
 .idea/
+.vscode/
 target/
 **/schema/
 /artifacts/
-.rtx.toml
+.rtx.toml
+*.lock
+node_modules

Cargo.toml

@@ -12,6 +12,7 @@ members = [
     "contracts/proposal-votes-poc",
     "contracts/provider-proposals-poc",
     "contracts/pump",
+    "contracts/locator",
     "contracts/puppeteer",
     # "contracts/puppeteer-authz",
     "contracts/rewards-manager",

contracts/factory/src/bin/drop-factory-schema.rs

@@ -1,5 +1,5 @@
 use cosmwasm_schema::write_api;
-use drop_factory::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use drop_staking_base::msg::factory::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 
 fn main() {
     write_api! {

contracts/factory/src/contract.rs

@@ -1,11 +1,3 @@
-use crate::{
-    error::ContractResult,
-    msg::{
-        ExecuteMsg, InstantiateMsg, MigrateMsg, ProxyMsg, QueryMsg, UpdateConfigMsg,
-        ValidatorSetMsg,
-    },
-    state::{State, STATE},
-};
 use cosmwasm_std::{
     attr, instantiate2_address, to_json_binary, Attribute, Binary, CodeInfoResponse, CosmosMsg,
     Deps, DepsMut, Env, HexBinary, MessageInfo, Response, StdResult, WasmMsg,
@@ -25,6 +17,14 @@ use drop_staking_base::msg::{
     },
     withdrawal_voucher::InstantiateMsg as WithdrawalVoucherInstantiateMsg,
 };
+use drop_staking_base::{
+    error::factory::ContractResult,
+    msg::factory::{
+        ExecuteMsg, InstantiateMsg, MigrateMsg, ProxyMsg, QueryMsg, UpdateConfigMsg,
+        ValidatorSetMsg,
+    },
+    state::factory::{State, STATE},
+};
 use neutron_sdk::{
     bindings::{msg::NeutronMsg, query::NeutronQuery},
     NeutronResult,
@@ -344,7 +344,7 @@ pub fn query(deps: Deps<NeutronQuery>, _env: Env, msg: QueryMsg) -> StdResult<Bi
 fn query_pause_info(deps: Deps<NeutronQuery>) -> StdResult<Binary> {
     let state = STATE.load(deps.storage)?;
 
-    to_json_binary(&crate::state::PauseInfoResponse {
+    to_json_binary(&drop_staking_base::state::factory::PauseInfoResponse {
         core: deps
             .querier
             .query_wasm_smart(state.core_contract, &CoreQueryMsg::PauseInfo {})?,
@@ -502,7 +502,7 @@ fn execute_proxy_msg(
             }
         },
         ProxyMsg::Core(msg) => match msg {
-            crate::msg::CoreMsg::UpdateNonNativeRewardsReceivers { items } => {
+            drop_staking_base::msg::factory::CoreMsg::UpdateNonNativeRewardsReceivers { items } => {
                 messages.push(get_proxied_message(
                     state.core_contract,
                     drop_staking_base::msg::core::ExecuteMsg::UpdateNonNativeRewardsReceivers {
@@ -517,14 +517,14 @@ fn execute_proxy_msg(
                             denoms: items.iter().map(|one|{one.denom.to_string()}).collect() }, info.funds)?
                 );
             }
-            crate::msg::CoreMsg::Pause {} => {
+            drop_staking_base::msg::factory::CoreMsg::Pause {} => {
                 messages.push(get_proxied_message(
                     state.core_contract,
                     drop_staking_base::msg::core::ExecuteMsg::Pause {},
                     vec![],
                 )?);
             }
-            crate::msg::CoreMsg::Unpause {} => {
+            drop_staking_base::msg::factory::CoreMsg::Unpause {} => {
                 messages.push(get_proxied_message(
                     state.core_contract,
                     drop_staking_base::msg::core::ExecuteMsg::Unpause {},

contracts/factory/src/lib.rs

@@ -1,4 +1 @@
 pub mod contract;
-pub mod error;
-pub mod msg;
-pub mod state;

contracts/locator/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+schema = "run --bin drop-locator-schema"

contracts/locator/Cargo.toml

@@ -0,0 +1,36 @@
+[package]
+authors = ["Vladislav Vasilev <vfaust.thefuture@gmail.com>"]
+description = "Contract to query all Drop contracts"
+edition = "2021"
+name = "drop-locator"
+version = "1.0.0"
+
+exclude = [
+  # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication.
+  "contract.wasm",
+  "hash.txt",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+# for more explicit tests, cargo test --features=backtraces
+backtraces = ["cosmwasm-std/backtraces"]
+# use library feature to disable all instantiate/execute/query exports
+library = []
+
+[dependencies]
+cosmwasm-schema     = { workspace = true }
+cosmwasm-std        = { workspace = true }
+cw-storage-plus     = { workspace = true }
+cw2                 = { workspace = true }
+thiserror           = { workspace = true }
+drop-staking-base   = { workspace = true }
+drop-puppeteer-base = { workspace = true }
+drop-helpers        = { workspace = true }
+drop-macros         = { workspace = true }
+neutron-sdk         = { workspace = true }
+cw-ownable          = { workspace = true }

contracts/locator/README.md

@@ -0,0 +1 @@
+# DROP Locator contract

contracts/locator/src/bin/drop-locator-schema.rs

@@ -0,0 +1,10 @@
+use cosmwasm_schema::write_api;
+use drop_locator::msg::{ExecuteMsg, InstantiateMsg, QueryMsg};
+
+fn main() {
+    write_api! {
+        instantiate: InstantiateMsg,
+        query: QueryMsg,
+        execute: ExecuteMsg
+    }
+}