Merge remote-tracking branch 'origin/main' into release-0.21

Author: Buckram123

modules/contracts/adapters/dex/src/api.rs

@@ -1,4 +1,6 @@
+use crate::DEX_ADAPTER_ID;
 use abstract_core::objects::{module::ModuleId, AnsAsset, AssetEntry, PoolAddress};
+use abstract_dex_standard::msg::GenerateMessagesResponse;
 use abstract_dex_standard::{
     ans_action::DexAnsAction,
     msg::{DexExecuteMsg, DexName, DexQueryMsg, SimulateSwapResponse},
@@ -12,10 +14,6 @@ use cosmwasm_schema::serde::de::DeserializeOwned;
 use cosmwasm_std::{CosmosMsg, Decimal, Deps};
 use cw_asset::{Asset, AssetInfo, AssetInfoBase};
 
-use crate::msg::GenerateMessagesResponse;
-
-use crate::DEX_ADAPTER_ID;
-
 use self::{ans::AnsDex, raw::Dex};
 
 // API for Abstract SDK users

schema/dex/0.20.0/adapter_response.json

@@ -29,7 +29,7 @@
       "description": "The pool on which the swap was simulated",
       "allOf": [
         {
-          "$ref": "#/definitions/DexAssetPairing"
+          "$ref": "#/definitions/DexAssetPairing_for_AssetEntry"
         }
       ]
     },
@@ -64,7 +64,7 @@
       "description": "An unchecked ANS asset entry. This is a string that is formatted as `src_chain>[intermediate_chain>]asset_name`",
       "type": "string"
     },
-    "DexAssetPairing": {
+    "DexAssetPairing_for_AssetEntry": {
       "description": "The key for an asset pairing Consists of the two assets and the dex name TODO: what if we made keys equal based on the two assets either way?",
       "type": "array",
       "items": [