chore: update genbutemple (#2328)

* 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) * feat: update suzuka (#2326) * Revert "Merge pull request #2315 from vegaprotocol/feat/maker_rebate_update" This reverts commit 09dd85a, reversing changes made to 44ecde7. * Revert "feat: separate fee discount components (#2293)" This reverts commit 0e9ab96. * chore: trigger checks * 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> * Merge pull request #2315 from vegaprotocol/feat/maker_rebate_update feat: calculate fraction of cumulative taker volume across window --------- Co-authored-by: Tom <tom@vegaprotocol.io> Co-authored-by: Witold <gawlikowicz@gmail.com> Co-authored-by: Jiajia-Cui <92106936+Jiajia-Cui@users.noreply.github.com> * chore: update feature files --------- 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 · b3386b4 · b3386b4
1 parent b00aa4d
commit b3386b4
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 216 deletions.
diff --git a/.github/workflows/quality_check.yml b/.github/workflows/quality_check.yml
@@ -12,6 +12,7 @@ name: "Quality checks"
       - colosseo
       - colosseo_II
       - genbutemple
+      - suzukacastle
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/protocol/colosseo-features.json b/protocol/colosseo-features.json
@@ -636,216 +636,6 @@
       "0094-PRAC-008"
     ]
   },
-  "Model-free alternatives": {
-    "milestone": "suzuka_castle",
-    "acs": [
-      "0016-PFUT-026",
-      "0016-PFUT-027",
-      "0016-PFUT-028",
-      "0053-PERP-047",
-      "0053-PERP-048",
-      "0053-PERP-049",
-      "0032-PRIM-041",
-      "0032-PRIM-042",
-      "0032-PRIM-043",
-      "0042-LIQF-095",
-      "0042-LIQF-096",
-      "0019-MCAL-159"
-    ]
-  },
-  "Fee mechanic changes": {
-    "milestone": "suzuka_castle",
-    "acs": []
-  },
-  "vAMMs": {
-    "milestone": "suzuka_castle",
-    "acs": [
-      "0042-LIQF-092",
-      "0042-LIQF-093",
-      "0042-LIQF-094",
-      "0090-VAMM-001",
-      "0090-VAMM-002",
-      "0090-VAMM-003",
-      "0090-VAMM-004",
-      "0090-VAMM-005",
-      "0090-VAMM-006",
-      "0090-VAMM-007",
-      "0090-VAMM-008",
-      "0090-VAMM-009",
-      "0090-VAMM-010",
-      "0090-VAMM-011",
-      "0090-VAMM-012",
-      "0090-VAMM-013",
-      "0090-VAMM-014",
-      "0090-VAMM-015",
-      "0090-VAMM-016",
-      "0090-VAMM-017",
-      "0090-VAMM-018",
-      "0090-VAMM-019",
-      "0090-VAMM-020",
-      "0090-VAMM-021",
-      "0090-VAMM-022",
-      "0090-VAMM-023",
-      "0090-VAMM-024",
-      "0090-VAMM-025",
-      "0090-VAMM-026",
-      "0090-VAMM-027",
-      "0090-VAMM-028",
-      "0090-VAMM-029",
-      "0090-VAMM-030",
-      "0090-VAMM-031",
-      "0090-VAMM-032",
-      "0090-VAMM-033",
-      "0090-VAMM-034",
-      "0090-VAMM-035",
-      "0057-TRAN-070",
-      "0026-AUCT-033",
-      "0026-AUCT-034",
-      "0026-AUCT-035",
-      "0026-AUCT-036",
-      "0026-AUCT-037",
-      "0014-NP-VAMM-001",
-      "0014-NP-VAMM-002",
-      "0014-NP-VAMM-003",
-      "0014-NP-VAMM-004",
-      "0015-NP-OBES-001",
-      "0015-NP-OBES-002",
-      "0042-LIQF-107",
-      "0042-LIQF-108",
-      "0042-LIQF-109",
-      "0042-LIQF-110",
-      "0042-LIQF-111",
-      "0056-REWA-170",
-      "0085-RVST-015",
-      "0085-RVST-016",
-      "0085-RVST-017",
-      "0085-RVST-018",
-      "0085-RVST-019",
-      "0085-RVST-020",
-      "0085-RVST-021",
-      "0085-RVST-022",
-      "0085-RVST-023",
-      "0085-RVST-024",
-      "0085-RVST-025"
-    ]
-  },
-  "Community Tags": {
-    "milestone": "suzuka_castle",
-    "acs": [
-      "0028-GOVE-168",
-      "0028-GOVE-169",
-      "0028-GOVE-170",
-      "0028-GOVE-171",
-      "0028-GOVE-172",
-      "0028-GOVE-173",
-      "0028-GOVE-174",
-      "0028-GOVE-175",
-      "0028-GOVE-176",
-      "0028-GOVE-177",
-      "0028-GOVE-178"
-    ]
-  },
-  "Spot AMM": {
-    "milestone": "genbu_temple",
-    "acs": [
-      "0092-SAMM-001",
-      "0092-SAMM-002",
-      "0092-SAMM-003",
-      "0092-SAMM-004",
-      "0092-SAMM-005",
-      "0092-SAMM-006",
-      "0092-SAMM-007",
-      "0092-SAMM-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": []

diff --git a/protocol/features.json b/protocol/features.json
@@ -1,7 +1,106 @@
 {
-    "Unknown": {
-      "milestone": "unknown",
-      "acs": []
-    }
-}
-
+  "Spot AMM": {
+    "milestone": "genbu_temple",
+    "acs": [
+      "0092-SAMM-001",
+      "0092-SAMM-002",
+      "0092-SAMM-003",
+      "0092-SAMM-004",
+      "0092-SAMM-005",
+      "0092-SAMM-006",
+      "0092-SAMM-007",
+      "0092-SAMM-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": []
+  }
+}