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>

protocol/0094-PRAC-protective_auctions.md

@@ -69,12 +69,9 @@ and at some point network determines that the length of the last block was 90s,
 - A market which has been in a per-market auction which was triggered before the network-wide auction was initiated remains in auction mode even if the exit condition for the original per-market auction gets satisfied before the network-wide auction ends. No intermediate trades get generated even in the presence of non-zero indicative volume at the point of that market's per-market auction exit condition being satisfied. The market only goes back into its default trading mode and possibly generates trades once the network-wide auction ends. (<a name="0094-PRAC-004" href="#0094-PRAC-004">0094-PRAC-004</a>)
 
 - A market which has been in a per-market auction which was triggered before the network-wide auction was initiated remains in auction mode once the network-wide auction ends if the exit condition for the original per-market auction hasn't been met at that point and no intermediate trades get generated even in the presence of non-zero indicative volume at the point of network-wide auction end. (<a name="0094-PRAC-005" href="#0094-PRAC-005">0094-PRAC-005</a>)
-<<<<<<< HEAD
 
 - When market is in a price monitoring auction which is meant to finish at `10am`, but prior to that time a long block auction finishing at 11am gets triggered then the market stays in auction till `11am`, it's auction trigger is listed as price monitoring auction and it's extension trigger is listed as long block auction.  (<a name="0094-PRAC-006" href="#0094-PRAC-006">0094-PRAC-006</a>)
 
 - When a market's `trigger` or `extension_trigger` is set to represent a governance suspension then no other triggers can affect the market.  (<a name="0094-PRAC-007" href="#0094-PRAC-007">0094-PRAC-007</a>)
 
 - When a market's `trigger` and `extension_trigger` are set to represent that the market went into auction due to the price monitoring mechanism and was later extended by the same mechanism and the auction is meant to finish at `11am`, but now a long block auction is being triggered so that it ends at `10am` then this market is unaffected in any way.  (<a name="0094-PRAC-008" href="#0094-PRAC-008">0094-PRAC-008</a>)
-=======
->>>>>>> 85b28baa (chore: update genbutemple branch (#2308))