chore: update genbutemple branch with colosseo II (#2322)

* feat: add AC for vAMM during opening auction * chore: typo * fix: reword * feat: Updates to fix up equations (#2303) * feat: tx trade ordering (#2231) * feat: Order trade transactions within a block * feat: AMM Estimates (#2282) * feat: Estimate within range * refactor: first stab at max block auction * refactor: add defaults * refactor: formalise action interaction + ACs * refactor: remove supplied liquidity requirement from ACs * chore: update approbation * chore: fix CI issues * milestone rejig * fix fee mechanic milestone, reorder features * chore: remove impossible AC, but mention the behaviour in spec Signed-off-by: Elias Van Ootegem <elias@vega.xyz> * chore: remove old AC from json Signed-off-by: Elias Van Ootegem <elias@vega.xyz> * feat: separate fee discount components (#2293) * feat: Adding separate discount factor components * feat: Adding separate discount factor components * feat: Add ACs * feat: Fix AC code * feat: Fix AC code * feat: Review comments * feat: Adding high volume maker rebate * feat: Fix up eqs * feat: Remove duplicative naming * chore: Fix up markdown * refactor: add default value --------- Co-authored-by: Witold <gawlikowicz@gmail.com> * rename 3 and rejig milestones * sorting * feat: change to average notional position * feat: calculate fraction of cumulative volume across window rather than average of fractions across window * fix: update spellcheck * Order spam (#2188) * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: wording Co-authored-by: Charlie <99198652+cdummett@users.noreply.github.com> * fix: spot correction Co-authored-by: Charlie <99198652+cdummett@users.noreply.github.com> * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * fix: clarify order spam * chore: clairfy spam protection for spot markets * fix: remove * fix: don't allow non-persistent orders that don't meet margin / value criteria * feat: Update spam tests on amendments * feat: Update spam tests on amendments * chore: revert inconsistent formatting * chore: fix markdownlint --------- Co-authored-by: Charlie <99198652+cdummett@users.noreply.github.com> Co-authored-by: Charlie <charlie@vegaprotocol.io> Co-authored-by: Tom McLean <tom@vegaprotocol.io> * Revert "feat: average notional position" (#2320) * chore: bump LP 3.0 spec number --------- Signed-off-by: Elias Van Ootegem <elias@vega.xyz> Co-authored-by: Jiajia-Cui <jiajia@vega.xyz> Co-authored-by: David Siska <62546419+davidsiska-vega@users.noreply.github.com> Co-authored-by: Jiajia-Cui <92106936+Jiajia-Cui@users.noreply.github.com> Co-authored-by: Tom <tom@vegaprotocol.io> Co-authored-by: Witold <gawlikowicz@gmail.com> Co-authored-by: Witold <witold@vega.xyz> Co-authored-by: Edd <edd@vega.xyz> Co-authored-by: Elias Van Ootegem <elias@vega.xyz> Co-authored-by: Jeremy Letang <me@jeremyletang.com>
vegaprotocol · Sep 17, 2024 · 6b2cdf6 · 6b2cdf6
1 parent cccf2be
commit 6b2cdf6
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 0 deletions.
diff --git a/protocol/0029-FEES-fees.md b/protocol/0029-FEES-fees.md
@@ -92,6 +92,8 @@ Note, discounts are calculated and applied one after the other and **before** re
 The infrastructure fee factor is set by a network parameter `market.fee.factors.infrastructureFee` and a reasonable default value is `fee_factor[infrastructure] = 0.0005 = 0.05%`.
 The maker fee factor is set by a network parameter `market.fee.factors.makerFee` and a reasonable default value is `fee_factor[maker] = 0.00025 = 0.025%`.
 The liquidity fee factor is set by an auction-like mechanism based on the liquidity provisions committed to the market, see [setting LP fees](./0042-LIQF-setting_fees_and_rewarding_lps.md).
+The treasury fee factor is set by the network parameter `market.fee.factors.treasuryFee` with a default value should of `0`.
+The buyback fee factor is set by the network parameter `market.fee.factors.buybackFee` with a default value should of `0`.
 
 The treasury fee factor is set by the network parameter `market.fee.factors.treasuryFee` can be changed through a network parameter update proposal. It has minimum allowable value of `0` maximum allowable value of `1` and a default of `0`.
 

diff --git a/protocol/0095-LIQM-liquidity_mechanisms.md → protocol/0096-LIQM-liquidity_mechanisms.md b/protocol/0095-LIQM-liquidity_mechanisms.md → protocol/0096-LIQM-liquidity_mechanisms.md
diff --git a/protocol/colosseo-features.json b/protocol/colosseo-features.json
@@ -636,6 +636,94 @@
       "0094-PRAC-008"
     ]
   },
+  "LP 3.0": {
+    "milestone": "genbu_temple",
+    "acs": []
+  },
+  "Token Buyback auction": {
+    "milestone": "genbu_temple",
+    "acs": []
+  },
+  "Cancelling Proposals": {
+    "milestone": "historic_distillery",
+    "acs": [
+      "0028-GOVE-188",
+      "0028-GOVE-189",
+      "0028-GOVE-190",
+      "0028-GOVE-191"
+    ]
+  },
+
+  "Perpetual funding rates": {
+    "milestone": "historic_distillery",
+    "acs": [
+      "0053-PERP-036"
+    ]
+  },
+  "LPs voting without gov token": {
+    "milestone": "historic_distillery",
+    "acs": [
+      "0028-GOVE-185"
+    ]
+  },
+  "Spot stretch": {
+    "milestone": "historic_distillery",
+    "acs": [
+      "0029-FEES-015",
+      "0029-FEES-016",
+      "0029-FEES-017",
+      "0029-FEES-018",
+      "0029-FEES-019",
+      "0029-FEES-020",
+      "0029-FEES-021",
+      "0029-FEES-022",
+      "0049-TVAL-007",
+      "0049-TVAL-008",
+      "0049-TVAL-009",
+      "0049-TVAL-010",
+      "0049-TVAL-011",
+      "0049-TVAL-012",
+      "0051-PROD-004",
+      "0051-PROD-005",
+      "0051-PROD-006",
+      "0052-FPOS-003",
+      "0052-FPOS-004",
+      "0054-NETP-007",
+      "0054-NETP-008",
+      "0054-NETP-009",
+      "0054-NETP-010",
+      "0054-NETP-011",
+      "0057-TRAN-063",
+      "0065-FTCO-005",
+      "0065-FTCO-006",
+      "0065-FTCO-007",
+      "0065-FTCO-008",
+      "0070-MKTD-010",
+      "0070-MKTD-011",
+      "0070-MKTD-012",
+      "0070-MKTD-013",
+      "0070-MKTD-014",
+      "0070-MKTD-015",
+      "0070-MKTD-022",
+      "0070-MKTD-024",
+      "0070-MKTD-025",
+      "0070-MKTD-026",
+      "0074-BTCH-012",
+      "0074-BTCH-015",
+      "0074-BTCH-016",
+      "0074-BTCH-019",
+      "0079-TGAP-006",
+      "0079-TGAP-007",
+      "0028-GOVE-186",
+      "0028-GOVE-187",
+      "0080-SPOT-024",
+      "0080-SPOT-025",
+      "0080-SPOT-026",
+      "0080-SPOT-027",
+      "0080-SPOT-028",
+      "0080-SPOT-029"
+    ]
+  },
   "Unknown": {
     "milestone": "unknown",
     "acs": []