Merge branch 'develop' into transfer_interval

vegaprotocol · Apr 23, 2024 · 3965b9c · 3965b9c
2 parents 721de8d + d679816
commit 3965b9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - [11143](https://github.com/vegaprotocol/vega/issues/11143) - Add support for new asset proposal in batch governance proposal.
 - [11184](https://github.com/vegaprotocol/vega/issues/11184) - relax the transfer restriction of 'same transfer' to match the full dispatch strategy.
 - [11185](https://github.com/vegaprotocol/vega/issues/11185) - distinguish between zero and none metric for rewards. 
+- [11158](https://github.com/vegaprotocol/vega/issues/11158) - resolve the quote asset for fee estimation in spot market. 
 
 ### 🐛 Fixes
 

diff --git a/protos/vega/market_ext.go b/protos/vega/market_ext.go
@@ -29,6 +29,8 @@ func (m *Market) GetAsset() (string, error) {
 		return pimpl.Future.SettlementAsset, nil
 	case *Instrument_Perpetual:
 		return pimpl.Perpetual.SettlementAsset, nil
+	case *Instrument_Spot:
+		return pimpl.Spot.QuoteAsset, nil
 	default:
 		return "", ErrUnknownAsset
 	}