feat: take rate

White-Whale-Defi-Platform · Jan 24, 2025 · f423770 · f423770
1 parent 41105a1
commit f423770
Show file tree

Hide file tree

Showing 16 changed files with 828 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,7 @@ prost = { version = "0.11.9", default-features = false, features = [
 prost-types = { version = "0.11.9", default-features = false }
 # for local development
 #white-whale-std = { path = "packages/white-whale-std" }
-white-whale-std = { version = "1.1.5" }
+white-whale-std = { version = "1.2.6" }
 white-whale-testing = { path = "./packages/white-whale-testing" }
 cw-multi-test = { version = "0.16.5" }
 uint = "0.9.5"

diff --git a/contracts/liquidity_hub/fee_collector/Cargo.toml b/contracts/liquidity_hub/fee_collector/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fee_collector"
-version = "1.1.7"
+version = "1.2.0"
 authors = ["Kerber0x <[email protected]>"]
 edition.workspace = true
 description = "Contract to collect the fees accrued by the pools and vaults in the liquidity hub"

diff --git a/contracts/liquidity_hub/fee_collector/schema/fee_collector.json b/contracts/liquidity_hub/fee_collector/schema/fee_collector.json
@@ -98,6 +98,12 @@
                   "null"
                 ]
               },
+              "is_take_rate_active": {
+                "type": [
+                  "boolean",
+                  "null"
+                ]
+              },
               "owner": {
                 "type": [
                   "string",
@@ -116,6 +122,22 @@
                   "null"
                 ]
               },
+              "take_rate": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Decimal"
+                  },
+                  {
+                    "type": "null"
+                  }
+                ]
+              },
+              "take_rate_dao_address": {
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
               "vault_factory": {
                 "type": [
                   "string",
@@ -241,6 +263,10 @@
           }
         ]
       },
+      "Decimal": {
+        "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+        "type": "string"
+      },
       "Epoch": {
         "type": "object",
         "required": [
@@ -760,15 +786,21 @@
       "type": "object",
       "required": [
         "fee_distributor",
+        "is_take_rate_active",
         "owner",
         "pool_factory",
         "pool_router",
+        "take_rate",
+        "take_rate_dao_address",
         "vault_factory"
       ],
       "properties": {
         "fee_distributor": {
           "$ref": "#/definitions/Addr"
         },
+        "is_take_rate_active": {
+          "type": "boolean"
+        },
         "owner": {
           "$ref": "#/definitions/Addr"
         },
@@ -778,6 +810,12 @@
         "pool_router": {
           "$ref": "#/definitions/Addr"
         },
+        "take_rate": {
+          "$ref": "#/definitions/Decimal"
+        },
+        "take_rate_dao_address": {
+          "$ref": "#/definitions/Addr"
+        },
         "vault_factory": {
           "$ref": "#/definitions/Addr"
         }
@@ -787,6 +825,10 @@
         "Addr": {
           "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
           "type": "string"
+        },
+        "Decimal": {
+          "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+          "type": "string"
         }
       }
     },

diff --git a/contracts/liquidity_hub/fee_collector/schema/raw/execute.json b/contracts/liquidity_hub/fee_collector/schema/raw/execute.json
@@ -88,6 +88,12 @@
                 "null"
               ]
             },
+            "is_take_rate_active": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "owner": {
               "type": [
                 "string",
@@ -106,6 +112,22 @@
                 "null"
               ]
             },
+            "take_rate": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/Decimal"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "take_rate_dao_address": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
             "vault_factory": {
               "type": [
                 "string",
@@ -231,6 +253,10 @@
         }
       ]
     },
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
+    },
     "Epoch": {
       "type": "object",
       "required": [

diff --git a/contracts/liquidity_hub/fee_collector/schema/raw/response_to_config.json b/contracts/liquidity_hub/fee_collector/schema/raw/response_to_config.json
@@ -4,15 +4,21 @@
   "type": "object",
   "required": [
     "fee_distributor",
+    "is_take_rate_active",
     "owner",
     "pool_factory",
     "pool_router",
+    "take_rate",
+    "take_rate_dao_address",
     "vault_factory"
   ],
   "properties": {
     "fee_distributor": {
       "$ref": "#/definitions/Addr"
     },
+    "is_take_rate_active": {
+      "type": "boolean"
+    },
     "owner": {
       "$ref": "#/definitions/Addr"
     },
@@ -22,6 +28,12 @@
     "pool_router": {
       "$ref": "#/definitions/Addr"
     },
+    "take_rate": {
+      "$ref": "#/definitions/Decimal"
+    },
+    "take_rate_dao_address": {
+      "$ref": "#/definitions/Addr"
+    },
     "vault_factory": {
       "$ref": "#/definitions/Addr"
     }
@@ -31,6 +43,10 @@
     "Addr": {
       "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
       "type": "string"
+    },
+    "Decimal": {
+      "description": "A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0\n\nThe greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)",
+      "type": "string"
     }
   }
 }