Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/v2_contracts' into fix/t…
Browse files Browse the repository at this point in the history 
…ests
  • Loading branch information
@kaimen-sano
kaimen-sano committed Apr 18, 2024
2 parents b4271db + 419ab90 commit a8ebb95
Show file tree
Hide file tree
Showing 10 changed files with 336 additions and 148 deletions.
178 changes: 120 additions & 58 deletions contracts/liquidity_hub/pool-manager/schema/pool-manager.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,22 +891,14 @@
},
"config": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Config",
"title": "ConfigResponse",
"type": "object",
"required": [
"feature_toggle",
"pool_creation_fee",
"whale_lair_addr"
"config"
],
"properties": {
"feature_toggle": {
"$ref": "#/definitions/FeatureToggle"
},
"pool_creation_fee": {
"$ref": "#/definitions/Coin"
},
"whale_lair_addr": {
"$ref": "#/definitions/Addr"
"config": {
"$ref": "#/definitions/Config"
}
},
"additionalProperties": false,
Expand All @@ -930,6 +922,26 @@
}
}
},
"Config": {
"type": "object",
"required": [
"feature_toggle",
"pool_creation_fee",
"whale_lair_addr"
],
"properties": {
"feature_toggle": {
"$ref": "#/definitions/FeatureToggle"
},
"pool_creation_fee": {
"$ref": "#/definitions/Coin"
},
"whale_lair_addr": {
"$ref": "#/definitions/Addr"
}
},
"additionalProperties": false
},
"FeatureToggle": {
"description": "Pool feature toggle",
"type": "object",
Expand Down Expand Up @@ -1054,45 +1066,14 @@
},
"pair": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "PairInfo",
"title": "PairInfoResponse",
"type": "object",
"required": [
"asset_decimals",
"asset_denoms",
"assets",
"lp_denom",
"pair_type",
"pool_fees"
"pair_info"
],
"properties": {
"asset_decimals": {
"type": "array",
"items": {
"type": "integer",
"format": "uint8",
"minimum": 0.0
}
},
"asset_denoms": {
"type": "array",
"items": {
"type": "string"
}
},
"assets": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"lp_denom": {
"type": "string"
},
"pair_type": {
"$ref": "#/definitions/PairType"
},
"pool_fees": {
"$ref": "#/definitions/PoolFee"
"pair_info": {
"$ref": "#/definitions/PairInfo"
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -1128,6 +1109,49 @@
},
"additionalProperties": false
},
"PairInfo": {
"type": "object",
"required": [
"asset_decimals",
"asset_denoms",
"assets",
"lp_denom",
"pair_type",
"pool_fees"
],
"properties": {
"asset_decimals": {
"type": "array",
"items": {
"type": "integer",
"format": "uint8",
"minimum": 0.0
}
},
"asset_denoms": {
"type": "array",
"items": {
"type": "string"
}
},
"assets": {
"type": "array",
"items": {
"$ref": "#/definitions/Coin"
}
},
"lp_denom": {
"type": "string"
},
"pair_type": {
"$ref": "#/definitions/PairType"
},
"pool_fees": {
"$ref": "#/definitions/PoolFee"
}
},
"additionalProperties": false
},
"PairType": {
"oneOf": [
{
Expand Down Expand Up @@ -1288,11 +1312,17 @@
},
"swap_route": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Array_of_SwapOperation",
"type": "array",
"items": {
"$ref": "#/definitions/SwapOperation"
"title": "SwapRouteResponse",
"type": "object",
"required": [
"swap_route"
],
"properties": {
"swap_route": {
"$ref": "#/definitions/SwapRoute"
}
},
"additionalProperties": false,
"definitions": {
"SwapOperation": {
"oneOf": [
Expand Down Expand Up @@ -1326,16 +1356,48 @@
"additionalProperties": false
}
]
},
"SwapRoute": {
"type": "object",
"required": [
"ask_asset_denom",
"offer_asset_denom",
"swap_operations"
],
"properties": {
"ask_asset_denom": {
"type": "string"
},
"offer_asset_denom": {
"type": "string"
},
"swap_operations": {
"type": "array",
"items": {
"$ref": "#/definitions/SwapOperation"
}
}
},
"additionalProperties": false
}
}
},
"swap_routes": {
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Array_of_SwapRouteResponse",
"type": "array",
"items": {
"$ref": "#/definitions/SwapRouteResponse"
"title": "SwapRoutesResponse",
"type": "object",
"required": [
"swap_routes"
],
"properties": {
"swap_routes": {
"type": "array",
"items": {
"$ref": "#/definitions/SwapRoute"
}
}
},
"additionalProperties": false,
"definitions": {
"SwapOperation": {
"oneOf": [
Expand Down Expand Up @@ -1370,12 +1432,12 @@
}
]
},
"SwapRouteResponse": {
"SwapRoute": {
"type": "object",
"required": [
"ask_asset_denom",
"offer_asset_denom",
"swap_route"
"swap_operations"
],
"properties": {
"ask_asset_denom": {
Expand All @@ -1384,7 +1446,7 @@
"offer_asset_denom": {
"type": "string"
},
"swap_route": {
"swap_operations": {
"type": "array",
"items": {
"$ref": "#/definitions/SwapOperation"
Expand Down
36 changes: 24 additions & 12 deletions contracts/liquidity_hub/pool-manager/schema/raw/response_to_config.json
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Config",
"title": "ConfigResponse",
"type": "object",
"required": [
"feature_toggle",
"pool_creation_fee",
"whale_lair_addr"
"config"
],
"properties": {
"feature_toggle": {
"$ref": "#/definitions/FeatureToggle"
},
"pool_creation_fee": {
"$ref": "#/definitions/Coin"
},
"whale_lair_addr": {
"$ref": "#/definitions/Addr"
"config": {
"$ref": "#/definitions/Config"
}
},
"additionalProperties": false,
Expand All @@ -39,6 +31,26 @@
}
}
},
"Config": {
"type": "object",
"required": [
"feature_toggle",
"pool_creation_fee",
"whale_lair_addr"
],
"properties": {
"feature_toggle": {
"$ref": "#/definitions/FeatureToggle"
},
"pool_creation_fee": {
"$ref": "#/definitions/Coin"
},
"whale_lair_addr": {
"$ref": "#/definitions/Addr"
}
},
"additionalProperties": false
},
"FeatureToggle": {
"description": "Pool feature toggle",
"type": "object",
Expand Down
Loading

0 comments on commit a8ebb95

Please sign in to comment.