Replace PoolAssets with PoolPair

quasar-finance · Aug 20, 2024 · d2f9993 · d2f9993
1 parent ef6adae
commit d2f9993
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 206 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,5 @@ containers_homes/
 # Cargo+Git helper file (https://github.com/rust-lang/cargo/blob/0.44.1/src/cargo/sources/git/utils.rs#L320-L327)
 **/.cargo-ok
 **/*.rs.bk
+.devcontainer/
 
diff --git a/smart-contracts/osmosis/contracts/cl-vault/Cargo.toml b/smart-contracts/osmosis/contracts/cl-vault/Cargo.toml
@@ -47,6 +47,7 @@ apollo-cw-asset = { workspace = true }
 dex-router-osmosis = {workspace = true}
 cw-vault-multi-standard = {git = "https://github.com/quasar-finance/cw-vault-standard", branch ="master", features = ["lockup", "force-unlock"]}
 osmosis-test-tube = { workspace = true, optional = true }
+quasar-types = { workspace = true }
 
 [dev-dependencies]
 proptest = { workspace = true }
diff --git a/smart-contracts/osmosis/contracts/cl-vault/schema/cl-vault.json b/smart-contracts/osmosis/contracts/cl-vault/schema/cl-vault.json
@@ -72,7 +72,6 @@
         "type": "string"
       },
       "VaultConfig": {
-        "description": "VAULT_CONFIG: Base config struct for the contract.",
         "type": "object",
         "required": [
           "dex_router",
@@ -82,36 +81,16 @@
         ],
         "properties": {
           "dex_router": {
-            "description": "Dex router address",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Addr"
-              }
-            ]
+            "$ref": "#/definitions/Addr"
           },
           "performance_fee": {
-            "description": "Percentage of profit to be charged as performance fee",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Decimal"
-              }
-            ]
+            "$ref": "#/definitions/Decimal"
           },
           "swap_max_slippage": {
-            "description": "swap max slippage",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Decimal"
-              }
-            ]
+            "$ref": "#/definitions/Decimal"
           },
           "treasury": {
-            "description": "Account to receive fee payments",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Addr"
-              }
-            ]
+            "$ref": "#/definitions/Addr"
           }
         },
         "additionalProperties": false
@@ -602,15 +581,13 @@
         "additionalProperties": false
       },
       "Metadata": {
-        "description": "metadata useful for display purposes",
         "type": "object",
         "required": [
           "name",
           "thesis"
         ],
         "properties": {
           "name": {
-            "description": "the name of the vault",
             "type": "string"
           },
           "thesis": {
@@ -754,7 +731,6 @@
         "type": "string"
       },
       "VaultConfig": {
-        "description": "VAULT_CONFIG: Base config struct for the contract.",
         "type": "object",
         "required": [
           "dex_router",
@@ -764,36 +740,16 @@
         ],
         "properties": {
           "dex_router": {
-            "description": "Dex router address",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Addr"
-              }
-            ]
+            "$ref": "#/definitions/Addr"
           },
           "performance_fee": {
-            "description": "Percentage of profit to be charged as performance fee",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Decimal"
-              }
-            ]
+            "$ref": "#/definitions/Decimal"
           },
           "swap_max_slippage": {
-            "description": "swap max slippage",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Decimal"
-              }
-            ]
+            "$ref": "#/definitions/Decimal"
           },
           "treasury": {
-            "description": "Account to receive fee payments",
-            "allOf": [
-              {
-                "$ref": "#/definitions/Addr"
-              }
-            ]
+            "$ref": "#/definitions/Addr"
           }
         },
         "additionalProperties": false

diff --git a/smart-contracts/osmosis/contracts/cl-vault/schema/raw/execute.json b/smart-contracts/osmosis/contracts/cl-vault/schema/raw/execute.json
@@ -482,15 +482,13 @@
       "additionalProperties": false
     },
     "Metadata": {
-      "description": "metadata useful for display purposes",
       "type": "object",
       "required": [
         "name",
         "thesis"
       ],
       "properties": {
         "name": {
-          "description": "the name of the vault",
           "type": "string"
         },
         "thesis": {
@@ -634,7 +632,6 @@
       "type": "string"
     },
     "VaultConfig": {
-      "description": "VAULT_CONFIG: Base config struct for the contract.",
       "type": "object",
       "required": [
         "dex_router",
@@ -644,36 +641,16 @@
       ],
       "properties": {
         "dex_router": {
-          "description": "Dex router address",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Addr"
-            }
-          ]
+          "$ref": "#/definitions/Addr"
         },
         "performance_fee": {
-          "description": "Percentage of profit to be charged as performance fee",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
+          "$ref": "#/definitions/Decimal"
         },
         "swap_max_slippage": {
-          "description": "swap max slippage",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
+          "$ref": "#/definitions/Decimal"
         },
         "treasury": {
-          "description": "Account to receive fee payments",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Addr"
-            }
-          ]
+          "$ref": "#/definitions/Addr"
         }
       },
       "additionalProperties": false

diff --git a/smart-contracts/osmosis/contracts/cl-vault/schema/raw/instantiate.json b/smart-contracts/osmosis/contracts/cl-vault/schema/raw/instantiate.json
@@ -68,7 +68,6 @@
       "type": "string"
     },
     "VaultConfig": {
-      "description": "VAULT_CONFIG: Base config struct for the contract.",
       "type": "object",
       "required": [
         "dex_router",
@@ -78,36 +77,16 @@
       ],
       "properties": {
         "dex_router": {
-          "description": "Dex router address",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Addr"
-            }
-          ]
+          "$ref": "#/definitions/Addr"
         },
         "performance_fee": {
-          "description": "Percentage of profit to be charged as performance fee",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
+          "$ref": "#/definitions/Decimal"
         },
         "swap_max_slippage": {
-          "description": "swap max slippage",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Decimal"
-            }
-          ]
+          "$ref": "#/definitions/Decimal"
         },
         "treasury": {
-          "description": "Account to receive fee payments",
-          "allOf": [
-            {
-              "$ref": "#/definitions/Addr"
-            }
-          ]
+          "$ref": "#/definitions/Addr"
         }
       },
       "additionalProperties": false